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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 }], | 171 }], |
172 [ 'skia_arch_type == "x86"', { | 172 [ 'skia_arch_type == "x86"', { |
173 'msvs_configuration_platform': 'Win32', | 173 'msvs_configuration_platform': 'Win32', |
174 }], | 174 }], |
175 [ 'skia_warnings_as_errors', { | 175 [ 'skia_warnings_as_errors', { |
176 'msvs_settings': { | 176 'msvs_settings': { |
177 'VCCLCompilerTool': { | 177 'VCCLCompilerTool': { |
178 'WarnAsError': 'true', | 178 'WarnAsError': 'true', |
179 'AdditionalOptions': [ | 179 'AdditionalOptions': [ |
180 '/we4189', # initialized but unused var warning | 180 '/we4189', # initialized but unused var warning |
| 181 '/we4238', # taking address of rvalue |
| 182 '/we4239', # assigning rvalues to non-const lvalues |
181 ], | 183 ], |
182 }, | 184 }, |
183 }, | 185 }, |
184 }], | 186 }], |
185 [ 'skia_win_exceptions', { | 187 [ 'skia_win_exceptions', { |
186 'msvs_settings': { | 188 'msvs_settings': { |
187 'VCCLCompilerTool': { | 189 'VCCLCompilerTool': { |
188 'AdditionalOptions': [ | 190 'AdditionalOptions': [ |
189 '/EHsc', | 191 '/EHsc', |
190 ], | 192 ], |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 673 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
672 }, | 674 }, |
673 }], | 675 }], |
674 | 676 |
675 ], # end 'conditions' | 677 ], # end 'conditions' |
676 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 678 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
677 'xcode_settings': { | 679 'xcode_settings': { |
678 'SYMROOT': '<(DEPTH)/xcodebuild', | 680 'SYMROOT': '<(DEPTH)/xcodebuild', |
679 }, | 681 }, |
680 } | 682 } |
OLD | NEW |