Chromium Code Reviews| 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 # Just for testing... | 9 # Just for testing... |
| 10 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | 10 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 179 '-g', | 179 '-g', |
| 180 '-fno-exceptions', | 180 '-fno-exceptions', |
| 181 '-fstrict-aliasing', | 181 '-fstrict-aliasing', |
| 182 | 182 |
| 183 '-Wall', | 183 '-Wall', |
| 184 '-Wextra', | 184 '-Wextra', |
| 185 '-Winit-self', | 185 '-Winit-self', |
| 186 '-Wpointer-arith', | 186 '-Wpointer-arith', |
| 187 | 187 |
| 188 '-Wno-unused-parameter', | 188 '-Wno-unused-parameter', |
| 189 # For now. Perhaps I should do what mtklein suggested and add skia_pic | |
|
djsollen
2014/07/18 14:11:54
that seems like a good idea with a default to true
scroggo
2014/07/18 19:31:01
Uploaded a separate CL for that: https://coderevie
| |
| 190 '-fPIC', | |
| 189 ], | 191 ], |
| 190 'cflags_cc': [ | 192 'cflags_cc': [ |
| 191 '-fno-rtti', | 193 '-fno-rtti', |
| 192 '-Wnon-virtual-dtor', | 194 '-Wnon-virtual-dtor', |
| 193 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i s POD. | 195 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i s POD. |
| 194 ], | 196 ], |
| 195 'conditions': [ | 197 'conditions': [ |
| 196 [ 'skia_os != "chromeos"', { | 198 [ 'skia_os != "chromeos"', { |
| 197 'conditions': [ | 199 'conditions': [ |
| 198 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { | 200 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 700 [ 'skia_crash_handler', { | 702 [ 'skia_crash_handler', { |
| 701 'defines': [ 'SK_CRASH_HANDLER' ], | 703 'defines': [ 'SK_CRASH_HANDLER' ], |
| 702 }], | 704 }], |
| 703 | 705 |
| 704 ], # end 'conditions' | 706 ], # end 'conditions' |
| 705 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details | 707 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details |
| 706 'xcode_settings': { | 708 'xcode_settings': { |
| 707 'SYMROOT': '<(DEPTH)/xcodebuild', | 709 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 708 }, | 710 }, |
| 709 } | 711 } |
| OLD | NEW |