| 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_GPU=<(skia_gpu)', | 6 'SK_SUPPORT_GPU=<(skia_gpu)', |
| 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', | 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', |
| 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', | 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 '-Wall', | 195 '-Wall', |
| 196 '-Wextra', | 196 '-Wextra', |
| 197 '-Winit-self', | 197 '-Winit-self', |
| 198 '-Wpointer-arith', | 198 '-Wpointer-arith', |
| 199 | 199 |
| 200 '-Wno-c++11-extensions', | 200 '-Wno-c++11-extensions', |
| 201 '-Wno-unused-parameter', | 201 '-Wno-unused-parameter', |
| 202 ], | 202 ], |
| 203 'cflags_cc': [ | 203 'cflags_cc': [ |
| 204 '-fno-rtti', | 204 '-fno-rtti', |
| 205 '-fno-threadsafe-statics', # Chrome disables this, so for safety we s
hould too. | |
| 206 '-Wnon-virtual-dtor', | 205 '-Wnon-virtual-dtor', |
| 207 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i
s POD. | 206 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i
s POD. |
| 208 ], | 207 ], |
| 209 'conditions': [ | 208 'conditions': [ |
| 210 [ 'skia_os != "chromeos"', { | 209 [ 'skia_os != "chromeos"', { |
| 211 'conditions': [ | 210 'conditions': [ |
| 212 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { | 211 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { |
| 213 'cflags': [ | 212 'cflags': [ |
| 214 '-m64', | 213 '-m64', |
| 215 ], | 214 ], |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 [ 'skia_is_bot', { | 631 [ 'skia_is_bot', { |
| 633 'defines': [ 'SK_CRASH_HANDLER' ], | 632 'defines': [ 'SK_CRASH_HANDLER' ], |
| 634 }], | 633 }], |
| 635 | 634 |
| 636 ], # end 'conditions' | 635 ], # end 'conditions' |
| 637 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 638 'xcode_settings': { | 637 'xcode_settings': { |
| 639 'SYMROOT': '<(DEPTH)/xcodebuild', | 638 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 640 }, | 639 }, |
| 641 } | 640 } |
| OLD | NEW |