| 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' : [ |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 { | 26 { |
| 27 'defines': [ | 27 'defines': [ |
| 28 'SK_BUILD_FOR_WIN32', | 28 'SK_BUILD_FOR_WIN32', |
| 29 '_CRT_SECURE_NO_WARNINGS', | 29 '_CRT_SECURE_NO_WARNINGS', |
| 30 'GR_GL_FUNCTION_TYPE=__stdcall', | 30 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 31 ], | 31 ], |
| 32 'msvs_disabled_warnings': [ | 32 'msvs_disabled_warnings': [ |
| 33 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. |
| 34 ], | 34 ], |
| 35 'msvs_cygwin_shell': 0, | 35 'msvs_cygwin_shell': 0, |
| 36 'msvs_disabled_warnings': [4275], |
| 36 'msvs_settings': { | 37 'msvs_settings': { |
| 37 'VCCLCompilerTool': { | 38 'VCCLCompilerTool': { |
| 38 'WarningLevel': '3', | 39 'WarningLevel': '3', |
| 39 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | 40 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', |
| 40 'DebugInformationFormat': '3', | 41 'DebugInformationFormat': '3', |
| 41 'ExceptionHandling': '0', | 42 'ExceptionHandling': '0', |
| 42 'AdditionalOptions': [ '/MP', ], | 43 'AdditionalOptions': [ '/MP', ], |
| 43 }, | 44 }, |
| 44 'VCLinkerTool': { | 45 'VCLinkerTool': { |
| 45 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM
on 32-bit builds." | 46 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM
on 32-bit builds." |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 684 'SK_BUILD_JSON_WRITER', | 685 'SK_BUILD_JSON_WRITER', |
| 685 ] | 686 ] |
| 686 }], | 687 }], |
| 687 | 688 |
| 688 ], # end 'conditions' | 689 ], # end 'conditions' |
| 689 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 690 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 690 'xcode_settings': { | 691 'xcode_settings': { |
| 691 'SYMROOT': '<(DEPTH)/xcodebuild', | 692 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 692 }, | 693 }, |
| 693 } | 694 } |
| OLD | NEW |