| 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' : [ |
| 11 [ 'skia_arch_type == "arm64"', { | 11 [ 'skia_arch_type == "arm64"', { |
| 12 'cflags': [ | 12 'cflags': [ |
| 13 '-ffp-contract=off', | 13 '-ffp-contract=off', |
| 14 ], | 14 ], |
| 15 }], | 15 }], |
| 16 | 16 |
| 17 # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac). | |
| 18 [ 'skia_arch_type == "x86"', { | |
| 19 'cflags': [ '-msse2' ], | |
| 20 }], | |
| 21 | |
| 22 [ 'skia_os == "win"', | 17 [ 'skia_os == "win"', |
| 23 { | 18 { |
| 24 'defines': [ | 19 'defines': [ |
| 25 'SK_BUILD_FOR_WIN32', | 20 'SK_BUILD_FOR_WIN32', |
| 26 '_CRT_SECURE_NO_WARNINGS', | 21 '_CRT_SECURE_NO_WARNINGS', |
| 27 'GR_GL_FUNCTION_TYPE=__stdcall', | 22 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 28 ], | 23 ], |
| 29 'msvs_disabled_warnings': [ | 24 'msvs_disabled_warnings': [ |
| 30 4345, # This is an FYI about a behavior change from long ago. Chro
me stifles it too. | 25 4345, # This is an FYI about a behavior change from long ago. Chro
me stifles it too. |
| 31 ], | 26 ], |
| (...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 'SK_BUILD_JSON_WRITER', | 644 'SK_BUILD_JSON_WRITER', |
| 650 ] | 645 ] |
| 651 }], | 646 }], |
| 652 | 647 |
| 653 ], # end 'conditions' | 648 ], # end 'conditions' |
| 654 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 649 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 655 'xcode_settings': { | 650 'xcode_settings': { |
| 656 'SYMROOT': '<(DEPTH)/xcodebuild', | 651 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 657 }, | 652 }, |
| 658 } | 653 } |
| OLD | NEW |