| 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 }], | 299 }], |
| 300 [ 'skia_arch_width == 32', { | 300 [ 'skia_arch_width == 32', { |
| 301 'xcode_settings': { | 301 'xcode_settings': { |
| 302 'ARCHS': ['i386'], | 302 'ARCHS': ['i386'], |
| 303 }, | 303 }, |
| 304 }], | 304 }], |
| 305 [ 'skia_warnings_as_errors', { | 305 [ 'skia_warnings_as_errors', { |
| 306 'xcode_settings': { | 306 'xcode_settings': { |
| 307 'OTHER_CPLUSPLUSFLAGS': [ | 307 'OTHER_CPLUSPLUSFLAGS': [ |
| 308 '-Werror', | 308 '-Werror', |
| 309 '-Wall', |
| 310 '-Wextra', |
| 311 '-Wno-unused-parameter', |
| 309 ], | 312 ], |
| 310 }, | 313 }, |
| 311 }], | 314 }], |
| 312 ], | 315 ], |
| 313 'configurations': { | 316 'configurations': { |
| 314 'Debug': { | 317 'Debug': { |
| 315 'xcode_settings': { | 318 'xcode_settings': { |
| 316 'GCC_OPTIMIZATION_LEVEL': '0', | 319 'GCC_OPTIMIZATION_LEVEL': '0', |
| 317 }, | 320 }, |
| 318 }, | 321 }, |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 'xcode_settings': { | 467 'xcode_settings': { |
| 465 'SYMROOT': '<(DEPTH)/xcodebuild', | 468 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 466 }, | 469 }, |
| 467 } | 470 } |
| 468 | 471 |
| 469 # Local Variables: | 472 # Local Variables: |
| 470 # tab-width:2 | 473 # tab-width:2 |
| 471 # indent-tabs-mode:nil | 474 # indent-tabs-mode:nil |
| 472 # End: | 475 # End: |
| 473 # vim: set expandtab tabstop=2 shiftwidth=2: | 476 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |