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_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', | 8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| 11 [ 'skia_arch_type == "arm64"', { | |
| 12 'cflags': [ | |
| 13 '-ffp-contract=off', | |
|
hal.canary
2014/03/20 13:55:27
Why are you adding this? We don't use this for an
djsollen
2014/03/20 14:40:16
What test fails? Does the test only fail in releas
kevin.petit
2014/03/20 16:05:09
It was MatrixTest failing only in release mode.
| |
| 14 ], | |
| 15 }], | |
| 16 | |
| 11 [ 'skia_os == "win"', | 17 [ 'skia_os == "win"', |
| 12 { | 18 { |
| 13 'defines': [ | 19 'defines': [ |
| 14 'SK_BUILD_FOR_WIN32', | 20 'SK_BUILD_FOR_WIN32', |
| 15 '_CRT_SECURE_NO_WARNINGS', | 21 '_CRT_SECURE_NO_WARNINGS', |
| 16 'GR_GL_FUNCTION_TYPE=__stdcall', | 22 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 17 ], | 23 ], |
| 18 'msvs_cygwin_shell': 0, | 24 'msvs_cygwin_shell': 0, |
| 19 'msvs_settings': { | 25 'msvs_settings': { |
| 20 'VCCLCompilerTool': { | 26 'VCCLCompilerTool': { |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 502 'defines': [ | 508 'defines': [ |
| 503 'SK_USE_POSIX_THREADS', | 509 'SK_USE_POSIX_THREADS', |
| 504 ], | 510 ], |
| 505 }], | 511 }], |
| 506 ], # end 'conditions' | 512 ], # end 'conditions' |
| 507 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details | 513 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details |
| 508 'xcode_settings': { | 514 'xcode_settings': { |
| 509 'SYMROOT': '<(DEPTH)/xcodebuild', | 515 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 510 }, | 516 }, |
| 511 } | 517 } |
| OLD | NEW |