| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 ], | 56 ], |
| 57 }], | 57 }], |
| 58 | 58 |
| 59 [ 'skia_os == "win"', | 59 [ 'skia_os == "win"', |
| 60 { | 60 { |
| 61 'defines': [ | 61 'defines': [ |
| 62 'SK_BUILD_FOR_WIN32', | 62 'SK_BUILD_FOR_WIN32', |
| 63 '_CRT_SECURE_NO_WARNINGS', | 63 '_CRT_SECURE_NO_WARNINGS', |
| 64 'GR_GL_FUNCTION_TYPE=__stdcall', | 64 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 65 '_HAS_EXCEPTIONS=0', | 65 '_HAS_EXCEPTIONS=0', |
| 66 'SK_PRINT_CODEC_MESSAGES', |
| 66 ], | 67 ], |
| 67 'msvs_disabled_warnings': [ | 68 'msvs_disabled_warnings': [ |
| 68 4275, # An exported class was derived from a class that was not exp
orted | 69 4275, # An exported class was derived from a class that was not exp
orted |
| 69 4345, # This is an FYI about a behavior change from long ago. Chrom
e stifles it too. | 70 4345, # This is an FYI about a behavior change from long ago. Chrom
e stifles it too. |
| 70 4355, # 'this' used in base member initializer list. Off by default
in newer compilers. | 71 4355, # 'this' used in base member initializer list. Off by default
in newer compilers. |
| 71 ], | 72 ], |
| 72 'msvs_cygwin_shell': 0, | 73 'msvs_cygwin_shell': 0, |
| 73 'msvs_settings': { | 74 'msvs_settings': { |
| 74 'VCCLCompilerTool': { | 75 'VCCLCompilerTool': { |
| 75 'WarningLevel': '3', | 76 'WarningLevel': '3', |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 690 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
| 690 }, | 691 }, |
| 691 }], | 692 }], |
| 692 | 693 |
| 693 ], # end 'conditions' | 694 ], # end 'conditions' |
| 694 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 695 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 695 'xcode_settings': { | 696 'xcode_settings': { |
| 696 'SYMROOT': '<(DEPTH)/xcodebuild', | 697 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 697 }, | 698 }, |
| 698 } | 699 } |
| OLD | NEW |