| 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 ], | 6 ], |
| 7 'conditions' : [ | 7 'conditions' : [ |
| 8 [ 'skia_gpu == 1', | 8 [ 'skia_gpu == 1', |
| 9 { | 9 { |
| 10 'defines': [ | 10 'defines': [ |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', | 347 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', |
| 348 'conditions': [ | 348 'conditions': [ |
| 349 [ 'skia_osx_sdkroot==""', { | 349 [ 'skia_osx_sdkroot==""', { |
| 350 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot | 350 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot |
| 351 }, { | 351 }, { |
| 352 'SDKROOT': '<(skia_osx_sdkroot)', # -isysroot | 352 'SDKROOT': '<(skia_osx_sdkroot)', # -isysroot |
| 353 }], | 353 }], |
| 354 ], | 354 ], |
| 355 # trying to get this to work, but it needs clang I think... | 355 # trying to get this to work, but it needs clang I think... |
| 356 # 'WARNING_CFLAGS': '-Wexit-time-destructors', | 356 # 'WARNING_CFLAGS': '-Wexit-time-destructors', |
| 357 'CLANG_LINK_OBJC_RUNTIME': 'NO', |
| 357 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', | 358 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', |
| 358 'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES', | 359 'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES', |
| 359 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES', | 360 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES', |
| 360 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'YES', | 361 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'YES', |
| 361 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', | 362 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', |
| 362 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'YES', | 363 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'YES', |
| 363 'GCC_WARN_ABOUT_POINTER_SIGNEDNESS': 'YES', | 364 'GCC_WARN_ABOUT_POINTER_SIGNEDNESS': 'YES', |
| 364 'GCC_WARN_ABOUT_RETURN_TYPE': 'YES', | 365 'GCC_WARN_ABOUT_RETURN_TYPE': 'YES', |
| 365 'GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL': 'YES', | 366 'GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL': 'YES', |
| 366 'GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED': 'YES', | 367 'GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED': 'YES', |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 'xcode_settings': { | 483 'xcode_settings': { |
| 483 'SYMROOT': '<(DEPTH)/xcodebuild', | 484 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 484 }, | 485 }, |
| 485 } | 486 } |
| 486 | 487 |
| 487 # Local Variables: | 488 # Local Variables: |
| 488 # tab-width:2 | 489 # tab-width:2 |
| 489 # indent-tabs-mode:nil | 490 # indent-tabs-mode:nil |
| 490 # End: | 491 # End: |
| 491 # vim: set expandtab tabstop=2 shiftwidth=2: | 492 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |