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