| OLD | NEW |
| 1 # conditions used in both common.gypi and skia.gyp in chromium | 1 # conditions used in both common.gypi and skia.gyp in chromium |
| 2 # | 2 # |
| 3 { | 3 { |
| 4 'defines': [ | 4 'defines': [ |
| 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| 6 'SK_SUPPORT_GPU=<(skia_gpu)', | 6 'SK_SUPPORT_GPU=<(skia_gpu)', |
| 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', | 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', |
| 8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', | 8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 }, | 341 }, |
| 342 'Release': { | 342 'Release': { |
| 343 'xcode_settings': { | 343 'xcode_settings': { |
| 344 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', | 344 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', |
| 345 }, | 345 }, |
| 346 'defines': [ 'NDEBUG' ], | 346 'defines': [ 'NDEBUG' ], |
| 347 }, | 347 }, |
| 348 }, | 348 }, |
| 349 'xcode_settings': { | 349 'xcode_settings': { |
| 350 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', | 350 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', |
| 351 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in e
nvironment to ld. | 351 'conditions': [ |
| 352 [ 'skia_osx_deployment_target==""', { |
| 353 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed
in environment to ld. |
| 354 }, { |
| 355 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', |
| 356 }], |
| 357 ], |
| 352 # trying to get this to work, but it needs clang I think... | 358 # trying to get this to work, but it needs clang I think... |
| 353 # 'WARNING_CFLAGS': '-Wexit-time-destructors', | 359 # 'WARNING_CFLAGS': '-Wexit-time-destructors', |
| 354 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', | 360 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', |
| 355 'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES', | 361 'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES', |
| 356 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES', | 362 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES', |
| 357 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'YES', | 363 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'YES', |
| 358 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', | 364 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', |
| 359 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'YES', | 365 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'YES', |
| 360 'GCC_WARN_ABOUT_POINTER_SIGNEDNESS': 'YES', | 366 'GCC_WARN_ABOUT_POINTER_SIGNEDNESS': 'YES', |
| 361 'GCC_WARN_ABOUT_RETURN_TYPE': 'YES', | 367 'GCC_WARN_ABOUT_RETURN_TYPE': 'YES', |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 'defines': [ | 474 'defines': [ |
| 469 'SK_USE_POSIX_THREADS', | 475 'SK_USE_POSIX_THREADS', |
| 470 ], | 476 ], |
| 471 }], | 477 }], |
| 472 ], # end 'conditions' | 478 ], # end 'conditions' |
| 473 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 479 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 474 'xcode_settings': { | 480 'xcode_settings': { |
| 475 'SYMROOT': '<(DEPTH)/xcodebuild', | 481 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 476 }, | 482 }, |
| 477 } | 483 } |
| OLD | NEW |