| 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': [ |
| 20 '-msse2', |
| 21 '-mfpmath=sse', |
| 22 ], |
| 23 }], |
| 24 |
| 17 [ 'skia_os == "win"', | 25 [ 'skia_os == "win"', |
| 18 { | 26 { |
| 19 'defines': [ | 27 'defines': [ |
| 20 'SK_BUILD_FOR_WIN32', | 28 'SK_BUILD_FOR_WIN32', |
| 21 '_CRT_SECURE_NO_WARNINGS', | 29 '_CRT_SECURE_NO_WARNINGS', |
| 22 'GR_GL_FUNCTION_TYPE=__stdcall', | 30 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 23 ], | 31 ], |
| 24 'msvs_disabled_warnings': [ | 32 'msvs_disabled_warnings': [ |
| 25 4345, # This is an FYI about a behavior change from long ago. Chro
me stifles it too. | 33 4345, # This is an FYI about a behavior change from long ago. Chro
me stifles it too. |
| 26 ], | 34 ], |
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 'SK_BUILD_JSON_WRITER', | 651 'SK_BUILD_JSON_WRITER', |
| 644 ] | 652 ] |
| 645 }], | 653 }], |
| 646 | 654 |
| 647 ], # end 'conditions' | 655 ], # end 'conditions' |
| 648 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 656 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 649 'xcode_settings': { | 657 'xcode_settings': { |
| 650 'SYMROOT': '<(DEPTH)/xcodebuild', | 658 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 651 }, | 659 }, |
| 652 } | 660 } |
| OLD | NEW |