| OLD | NEW |
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # conditions used in both common.gypi and skia.gyp in chromium | 6 # conditions used in both common.gypi and skia.gyp in chromium |
| 7 # | 7 # |
| 8 { | 8 { |
| 9 'defines': [ | 9 'defines': [ |
| 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 ], | 59 ], |
| 60 }], | 60 }], |
| 61 | 61 |
| 62 [ 'skia_os == "win"', | 62 [ 'skia_os == "win"', |
| 63 { | 63 { |
| 64 'defines': [ | 64 'defines': [ |
| 65 'SK_BUILD_FOR_WIN32', | 65 'SK_BUILD_FOR_WIN32', |
| 66 '_CRT_SECURE_NO_WARNINGS', | 66 '_CRT_SECURE_NO_WARNINGS', |
| 67 'GR_GL_FUNCTION_TYPE=__stdcall', | 67 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 68 '_HAS_EXCEPTIONS=0', | 68 '_HAS_EXCEPTIONS=0', |
| 69 'WIN32_LEAN_AND_MEAN', |
| 70 'NOMINMAX', |
| 69 ], | 71 ], |
| 70 'msvs_disabled_warnings': [ | 72 'msvs_disabled_warnings': [ |
| 71 4275, # An exported class was derived from a class that was not exp
orted | 73 4275, # An exported class was derived from a class that was not exp
orted |
| 72 4345, # This is an FYI about a behavior change from long ago. Chrom
e stifles it too. | 74 4345, # This is an FYI about a behavior change from long ago. Chrom
e stifles it too. |
| 73 4355, # 'this' used in base member initializer list. Off by default
in newer compilers. | 75 4355, # 'this' used in base member initializer list. Off by default
in newer compilers. |
| 74 ], | 76 ], |
| 75 'msvs_cygwin_shell': 0, | 77 'msvs_cygwin_shell': 0, |
| 76 'msvs_settings': { | 78 'msvs_settings': { |
| 77 'VCCLCompilerTool': { | 79 'VCCLCompilerTool': { |
| 78 'WarningLevel': '3', | 80 'WarningLevel': '3', |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 703 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
| 702 }, | 704 }, |
| 703 }], | 705 }], |
| 704 | 706 |
| 705 ], # end 'conditions' | 707 ], # end 'conditions' |
| 706 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 708 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 707 'xcode_settings': { | 709 'xcode_settings': { |
| 708 'SYMROOT': '<(DEPTH)/xcodebuild', | 710 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 709 }, | 711 }, |
| 710 } | 712 } |
| OLD | NEW |