| 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 'configurations': { | 133 'configurations': { |
| 134 'Debug': { | 134 'Debug': { |
| 135 'cflags': ['-g'] | 135 'cflags': ['-g'] |
| 136 }, | 136 }, |
| 137 'Release': { | 137 'Release': { |
| 138 'cflags': ['-O3 -g'], | 138 'cflags': ['-O3 -g'], |
| 139 'defines': [ 'NDEBUG' ], | 139 'defines': [ 'NDEBUG' ], |
| 140 }, | 140 }, |
| 141 }, | 141 }, |
| 142 'cflags': [ | 142 'cflags': [ |
| 143 # TODO(tony): Enable -Werror once all the strict-aliasing problems | 143 '-Werror', |
| 144 # are fixed. | |
| 145 #'-Werror', | |
| 146 '-Wall', | 144 '-Wall', |
| 147 '-Wextra', | 145 '-Wextra', |
| 148 '-Wno-unused', | |
| 149 # suppressions below here were added for clang | 146 # suppressions below here were added for clang |
| 150 '-Wno-unused-parameter', | 147 '-Wno-unused-parameter', |
| 151 '-Wno-c++11-extensions' | 148 '-Wno-c++11-extensions' |
| 152 ], | 149 ], |
| 153 'conditions' : [ | 150 'conditions' : [ |
| 154 ['skia_warnings_as_errors == 1', { | 151 ['skia_warnings_as_errors == 1', { |
| 155 'cflags': [ | 152 'cflags': [ |
| 156 '-Werror', | 153 '-Werror', |
| 157 ], | 154 ], |
| 158 }], | 155 }], |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 'xcode_settings': { | 384 'xcode_settings': { |
| 388 'SYMROOT': '<(DEPTH)/xcodebuild', | 385 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 389 }, | 386 }, |
| 390 } | 387 } |
| 391 | 388 |
| 392 # Local Variables: | 389 # Local Variables: |
| 393 # tab-width:2 | 390 # tab-width:2 |
| 394 # indent-tabs-mode:nil | 391 # indent-tabs-mode:nil |
| 395 # End: | 392 # End: |
| 396 # vim: set expandtab tabstop=2 shiftwidth=2: | 393 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |