Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: build/common.gypi

Issue 981333002: win: Default build to x64 (Closed) Base URL: https://chromium.googlesource.com/chromium/mini_chromium@master
Patch Set: . Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2009 The Chromium Authors. All rights reserved. 1 # Copyright 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'variables': { 7 'variables': {
8 'clang%': 0, 8 'clang%': 0,
9 'conditions': [ 9 'conditions': [
10 ['OS=="mac"', { 10 ['OS=="mac"', {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 ], 155 ],
156 }], 156 }],
157 ], 157 ],
158 158
159 }], 159 }],
160 160
161 ['OS=="win"', { 161 ['OS=="win"', {
162 'msvs_configuration_attributes': { 162 'msvs_configuration_attributes': {
163 'CharacterSet': '1', 163 'CharacterSet': '1',
164 }, 164 },
165 'msvs_configuration_platform': 'x64',
165 'msvs_settings': { 166 'msvs_settings': {
166 'VCCLCompilerTool': { 167 'VCCLCompilerTool': {
167 'WarningLevel': '4', 168 'WarningLevel': '4',
168 'WarnAsError': 'true', 169 'WarnAsError': 'true',
169 'DebugInformationFormat': '3', 170 'DebugInformationFormat': '3',
170 'ExceptionHandling': '0', 171 'ExceptionHandling': '0',
171 'RuntimeTypeInfo': 'false', 172 'RuntimeTypeInfo': 'false',
172 'BufferSecurityCheck': 'true', 173 'BufferSecurityCheck': 'true',
173 'EnableFunctionLevelLinking': 'true', 174 'EnableFunctionLevelLinking': 'true',
174 }, 175 },
175 'VCLinkerTool': { 176 'VCLinkerTool': {
176 'GenerateDebugInformation': 'true', 177 'GenerateDebugInformation': 'true',
177 'SubSystem': '1', 178 'SubSystem': '1',
179 'MinimumRequiredVersion': '5.02', # Server 2003.
180 'TargetMachine': '17', # x64.
181 },
182 'VCLibrarianTool': {
183 'TargetMachine': '17', # x64.
178 }, 184 },
179 }, 185 },
180 'msvs_disabled_warnings': [ 186 'msvs_disabled_warnings': [
181 4100, # Unreferenced formal parameter. 187 4100, # Unreferenced formal parameter.
182 4127, # Conditional expression is constant. 188 4127, # Conditional expression is constant.
183 4201, # Nonstandard extension used : nameless struct/union. 189 4201, # Nonstandard extension used : nameless struct/union.
184 4324, # 'X' was padded due to __declspec(align()). 190 4324, # 'X' was padded due to __declspec(align()).
185 4351, # New behavior: elements of array will be default initialized. 191 4351, # New behavior: elements of array will be default initialized.
186 4530, # Exceptions are disabled. 192 4530, # Exceptions are disabled.
187 4702, # Unreachable code. https://crbug.com/346399 193 4702, # Unreachable code. https://crbug.com/346399
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 }], 281 }],
276 282
277 ['OS=="win"', { 283 ['OS=="win"', {
278 'msvs_settings': { 284 'msvs_settings': {
279 'VCCLCompilerTool': { 285 'VCCLCompilerTool': {
280 'Optimization': '0', 286 'Optimization': '0',
281 }, 287 },
282 }, 288 },
283 }], 289 }],
284 290
291 ],
292 },
285 293
286 ], 294 # gyp-ninja seems to requires these, but we don't use them.
295 'Debug_x64': {
296 'inherit_from': ['Debug'],
297 },
298 'Release_x64': {
299 'inherit_from': ['Release'],
287 }, 300 },
288 }, 301 },
289 }, 302 },
290 303
291 'conditions': [ 304 'conditions': [
292 ['OS=="mac"', { 305 ['OS=="mac"', {
293 'xcode_settings': { 306 'xcode_settings': {
294 'SYMROOT': '<(DEPTH)/xcodebuild', 307 'SYMROOT': '<(DEPTH)/xcodebuild',
295 }, 308 },
296 }], 309 }],
297 ], 310 ],
298 } 311 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698