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 ], | 6 ], |
| 7 'conditions' : [ | 7 'conditions' : [ |
| 8 [ 'skia_gpu == 1', | 8 [ 'skia_gpu == 1', |
| 9 { | 9 { |
| 10 'defines': [ | 10 'defines': [ |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 }, | 142 }, |
| 143 }, | 143 }, |
| 144 }], | 144 }], |
| 145 ], | 145 ], |
| 146 }, | 146 }, |
| 147 ], | 147 ], |
| 148 | 148 |
| 149 # The following section is common to linux + derivatives and android | 149 # The following section is common to linux + derivatives and android |
| 150 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', | 150 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', |
| 151 { | 151 { |
| 152 'cflags': [ | |
| 153 '-Wall', | |
| 154 '-Wextra', | |
| 155 '-Winit-self', | |
| 156 '-Wpointer-arith', | |
| 157 # suppressions below here were added for clang / android | |
| 158 '-Wno-unused-parameter', | |
| 159 ], | |
| 160 'cflags_cc': [ | |
| 161 '-Wnon-virtual-dtor', | |
| 162 ], | |
| 152 'conditions': [ | 163 'conditions': [ |
| 153 [ 'skia_warnings_as_errors', { | 164 [ 'skia_warnings_as_errors', { |
| 154 'cflags': [ | 165 'cflags': [ |
| 155 '-Werror', | 166 '-Werror', |
| 156 ], | 167 ], |
| 157 }], | 168 }], |
| 158 [ 'skia_arch_type == "arm" and arm_thumb == 1', { | 169 [ 'skia_arch_type == "arm" and arm_thumb == 1', { |
| 159 'cflags': [ | 170 'cflags': [ |
| 160 '-mthumb', | 171 '-mthumb', |
| 161 ], | 172 ], |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 223 }, | 234 }, |
| 224 'Release': { | 235 'Release': { |
| 225 'cflags': [ | 236 'cflags': [ |
| 226 '-O<(skia_release_optimization_level)', | 237 '-O<(skia_release_optimization_level)', |
| 227 '-g', | 238 '-g', |
| 228 ], | 239 ], |
| 229 'defines': [ 'NDEBUG' ], | 240 'defines': [ 'NDEBUG' ], |
| 230 }, | 241 }, |
| 231 }, | 242 }, |
| 232 'cflags': [ | 243 'cflags': [ |
| 233 '-Wall', | |
| 234 '-Wextra', | |
| 235 # suppressions below here were added for clang | 244 # suppressions below here were added for clang |
| 236 '-Wno-unused-parameter', | |
| 237 '-Wno-c++11-extensions', | 245 '-Wno-c++11-extensions', |
|
mtklein
2013/11/18 21:21:56
Move this guy up too and get rid of this block?
djsollen
2013/11/18 21:34:04
Done.
| |
| 238 ], | 246 ], |
| 239 'conditions' : [ | 247 'conditions' : [ |
| 240 [ 'skia_shared_lib', { | 248 [ 'skia_shared_lib', { |
| 241 'cflags': [ | 249 'cflags': [ |
| 242 '-fPIC', | 250 '-fPIC', |
| 243 ], | 251 ], |
| 244 'defines': [ | 252 'defines': [ |
| 245 'SKIA_DLL', | 253 'SKIA_DLL', |
| 246 'SKIA_IMPLEMENTATION=1', | 254 'SKIA_IMPLEMENTATION=1', |
| 247 ], | 255 ], |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 467 'cflags': ['-O2'], | 475 'cflags': ['-O2'], |
| 468 'defines': [ 'NDEBUG' ], | 476 'defines': [ 'NDEBUG' ], |
| 469 }, | 477 }, |
| 470 }, | 478 }, |
| 471 'libraries': [ | 479 'libraries': [ |
| 472 '-lstdc++', | 480 '-lstdc++', |
| 473 '-lm', | 481 '-lm', |
| 474 '-llog', | 482 '-llog', |
| 475 ], | 483 ], |
| 476 'cflags': [ | 484 'cflags': [ |
| 477 '-Wall', | |
| 478 '-fno-exceptions', | 485 '-fno-exceptions', |
| 479 '-fstrict-aliasing', | 486 '-fstrict-aliasing', |
| 480 '-fuse-ld=gold', | 487 '-fuse-ld=gold', |
| 481 ], | 488 ], |
| 482 'cflags_cc': [ | 489 'cflags_cc': [ |
| 483 '-fno-rtti', | 490 '-fno-rtti', |
| 484 ], | 491 ], |
| 485 'conditions': [ | 492 'conditions': [ |
| 486 [ 'skia_shared_lib', { | 493 [ 'skia_shared_lib', { |
| 487 'cflags': [ | 494 'cflags': [ |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 511 'xcode_settings': { | 518 'xcode_settings': { |
| 512 'SYMROOT': '<(DEPTH)/xcodebuild', | 519 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 513 }, | 520 }, |
| 514 } | 521 } |
| 515 | 522 |
| 516 # Local Variables: | 523 # Local Variables: |
| 517 # tab-width:2 | 524 # tab-width:2 |
| 518 # indent-tabs-mode:nil | 525 # indent-tabs-mode:nil |
| 519 # End: | 526 # End: |
| 520 # vim: set expandtab tabstop=2 shiftwidth=2: | 527 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |