| 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_HINTING_SCALE_FACTOR', | 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', |
| 7 ], | 7 ], |
| 8 'conditions' : [ | 8 'conditions' : [ |
| 9 [ 'skia_gpu == 1', | 9 [ 'skia_gpu == 1', |
| 10 { | 10 { |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 [ 'skia_warnings_as_errors', { | 301 [ 'skia_warnings_as_errors', { |
| 302 'xcode_settings': { | 302 'xcode_settings': { |
| 303 'OTHER_CPLUSPLUSFLAGS': [ | 303 'OTHER_CPLUSPLUSFLAGS': [ |
| 304 '-Werror', | 304 '-Werror', |
| 305 '-Wall', | 305 '-Wall', |
| 306 '-Wextra', | 306 '-Wextra', |
| 307 '-Wno-unused-parameter', | 307 '-Wno-unused-parameter', |
| 308 ], | 308 ], |
| 309 }, | 309 }, |
| 310 }], | 310 }], |
| 311 # This old compiler is really bad at figuring out when things are uninitialized,
so ignore it. |
| 312 [ '<(mac_sdk)==10.6', { |
| 313 'xcode_settings': { |
| 314 'OTHER_CPLUSPLUSFLAGS': [ |
| 315 '-Wno-uninitialized', |
| 316 ], |
| 317 }, |
| 318 }], |
| 311 ], | 319 ], |
| 312 'configurations': { | 320 'configurations': { |
| 313 'Debug': { | 321 'Debug': { |
| 314 'xcode_settings': { | 322 'xcode_settings': { |
| 315 'GCC_OPTIMIZATION_LEVEL': '0', | 323 'GCC_OPTIMIZATION_LEVEL': '0', |
| 316 }, | 324 }, |
| 317 }, | 325 }, |
| 318 'Release': { | 326 'Release': { |
| 319 'xcode_settings': { | 327 'xcode_settings': { |
| 320 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', | 328 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 463 'xcode_settings': { | 471 'xcode_settings': { |
| 464 'SYMROOT': '<(DEPTH)/xcodebuild', | 472 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 465 }, | 473 }, |
| 466 } | 474 } |
| 467 | 475 |
| 468 # Local Variables: | 476 # Local Variables: |
| 469 # tab-width:2 | 477 # tab-width:2 |
| 470 # indent-tabs-mode:nil | 478 # indent-tabs-mode:nil |
| 471 # End: | 479 # End: |
| 472 # vim: set expandtab tabstop=2 shiftwidth=2: | 480 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |