| 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 'SK_PICTURE_USE_SK_RECORD', | 9 'SK_PICTURE_USE_SK_RECORD', |
| 10 ], | 10 ], |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 }], | 37 }], |
| 38 | 38 |
| 39 [ 'skia_os == "win"', | 39 [ 'skia_os == "win"', |
| 40 { | 40 { |
| 41 'defines': [ | 41 'defines': [ |
| 42 'SK_BUILD_FOR_WIN32', | 42 'SK_BUILD_FOR_WIN32', |
| 43 '_CRT_SECURE_NO_WARNINGS', | 43 '_CRT_SECURE_NO_WARNINGS', |
| 44 'GR_GL_FUNCTION_TYPE=__stdcall', | 44 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 45 ], | 45 ], |
| 46 'msvs_disabled_warnings': [ | 46 'msvs_disabled_warnings': [ |
| 47 4345, # This is an FYI about a behavior change from long ago. Chro
me stifles it too. | 47 4275, # An exported class was derived from a class that was not exp
orted |
| 48 4345, # This is an FYI about a behavior change from long ago. Chrom
e stifles it too. |
| 49 4355, # 'this' used in base member initializer list. Off by default
in newer compilers. |
| 48 ], | 50 ], |
| 49 'msvs_cygwin_shell': 0, | 51 'msvs_cygwin_shell': 0, |
| 50 'msvs_disabled_warnings': [4275], | |
| 51 'msvs_settings': { | 52 'msvs_settings': { |
| 52 'VCCLCompilerTool': { | 53 'VCCLCompilerTool': { |
| 53 'WarningLevel': '3', | 54 'WarningLevel': '3', |
| 54 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', | 55 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', |
| 55 'DebugInformationFormat': '3', | 56 'DebugInformationFormat': '3', |
| 56 'ExceptionHandling': '0', | 57 'ExceptionHandling': '0', |
| 57 'AdditionalOptions': [ '/MP', ], | 58 'AdditionalOptions': [ '/MP', ], |
| 58 }, | 59 }, |
| 59 'VCLinkerTool': { | 60 'VCLinkerTool': { |
| 60 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM
on 32-bit builds." | 61 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM
on 32-bit builds." |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 [ 'skia_is_bot', { | 630 [ 'skia_is_bot', { |
| 630 'defines': [ 'SK_CRASH_HANDLER' ], | 631 'defines': [ 'SK_CRASH_HANDLER' ], |
| 631 }], | 632 }], |
| 632 | 633 |
| 633 ], # end 'conditions' | 634 ], # end 'conditions' |
| 634 # 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 |
| 635 'xcode_settings': { | 636 'xcode_settings': { |
| 636 'SYMROOT': '<(DEPTH)/xcodebuild', | 637 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 637 }, | 638 }, |
| 638 } | 639 } |
| OLD | NEW |