| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 }, | 142 }, |
| 143 }, | 143 }, |
| 144 'cflags': [ | 144 'cflags': [ |
| 145 '-Wall', | 145 '-Wall', |
| 146 '-Wextra', | 146 '-Wextra', |
| 147 # suppressions below here were added for clang | 147 # suppressions below here were added for clang |
| 148 '-Wno-unused-parameter', | 148 '-Wno-unused-parameter', |
| 149 '-Wno-c++11-extensions' | 149 '-Wno-c++11-extensions' |
| 150 ], | 150 ], |
| 151 'conditions' : [ | 151 'conditions' : [ |
| 152 [ 'skia_shared_lib', { |
| 153 'cflags': [ |
| 154 '-fPIC', |
| 155 ], |
| 156 'defines': [ |
| 157 'GR_DLL=1', |
| 158 'GR_IMPLEMENTATION=1', |
| 159 'SKIA_DLL', |
| 160 'SKIA_IMPLEMENTATION=1', |
| 161 ], |
| 162 }], |
| 152 [ 'skia_warnings_as_errors', { | 163 [ 'skia_warnings_as_errors', { |
| 153 'cflags': [ | 164 'cflags': [ |
| 154 '-Werror', | 165 '-Werror', |
| 155 ], | 166 ], |
| 156 }], | 167 }], |
| 157 [ 'skia_os == "nacl"', { | 168 [ 'skia_os == "nacl"', { |
| 158 'defines': [ | 169 'defines': [ |
| 159 'SK_BUILD_FOR_NACL', | 170 'SK_BUILD_FOR_NACL', |
| 160 ], | 171 ], |
| 161 'link_settings': { | 172 'link_settings': { |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 'xcode_settings': { | 433 'xcode_settings': { |
| 423 'SYMROOT': '<(DEPTH)/xcodebuild', | 434 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 424 }, | 435 }, |
| 425 } | 436 } |
| 426 | 437 |
| 427 # Local Variables: | 438 # Local Variables: |
| 428 # tab-width:2 | 439 # tab-width:2 |
| 429 # indent-tabs-mode:nil | 440 # indent-tabs-mode:nil |
| 430 # End: | 441 # End: |
| 431 # vim: set expandtab tabstop=2 shiftwidth=2: | 442 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |