| 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 [ 'skia_os == "win"', | 17 [ 'skia_os == "win"', |
| 18 { | 18 { |
| 19 'defines': [ | 19 'defines': [ |
| 20 'SK_BUILD_FOR_WIN32', | 20 'SK_BUILD_FOR_WIN32', |
| 21 '_CRT_SECURE_NO_WARNINGS', | 21 '_CRT_SECURE_NO_WARNINGS', |
| 22 'GR_GL_FUNCTION_TYPE=__stdcall', | 22 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 23 ], | 23 ], |
| 24 'msvs_disabled_warnings': [ |
| 25 4345, # This is an FYI about a behavior change from long ago. Chro
me stifles it too. |
| 26 ], |
| 24 'msvs_cygwin_shell': 0, | 27 'msvs_cygwin_shell': 0, |
| 25 'msvs_settings': { | 28 'msvs_settings': { |
| 26 'VCCLCompilerTool': { | 29 'VCCLCompilerTool': { |
| 27 'WarningLevel': '3', | 30 'WarningLevel': '3', |
| 28 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | 31 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', |
| 29 'DebugInformationFormat': '3', | 32 'DebugInformationFormat': '3', |
| 30 'ExceptionHandling': '0', | 33 'ExceptionHandling': '0', |
| 31 'AdditionalOptions': [ '/MP', ], | 34 'AdditionalOptions': [ '/MP', ], |
| 32 }, | 35 }, |
| 33 'VCLinkerTool': { | 36 'VCLinkerTool': { |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 'defines': [ | 630 'defines': [ |
| 628 'SK_USE_POSIX_THREADS', | 631 'SK_USE_POSIX_THREADS', |
| 629 ], | 632 ], |
| 630 }], | 633 }], |
| 631 ], # end 'conditions' | 634 ], # end 'conditions' |
| 632 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 635 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 633 'xcode_settings': { | 636 'xcode_settings': { |
| 634 'SYMROOT': '<(DEPTH)/xcodebuild', | 637 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 635 }, | 638 }, |
| 636 } | 639 } |
| OLD | NEW |