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

Side by Side Diff: pylib/gyp/generator/msvs.py

Issue 913493002: msvs: Prefer x64 toolset if we are running on 64-bit (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 5 years, 10 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 | Annotate | Revision Log
« 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 (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. 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 import copy 5 import copy
6 import ntpath 6 import ntpath
7 import os 7 import os
8 import posixpath 8 import posixpath
9 import re 9 import re
10 import subprocess 10 import subprocess
(...skipping 2606 matching lines...) Expand 10 before | Expand all | Expand 10 after
2617 namespace = os.path.splitext(gyp_file_name)[0] 2617 namespace = os.path.splitext(gyp_file_name)[0]
2618 properties = [ 2618 properties = [
2619 ['PropertyGroup', {'Label': 'Globals'}, 2619 ['PropertyGroup', {'Label': 'Globals'},
2620 ['ProjectGuid', guid], 2620 ['ProjectGuid', guid],
2621 ['Keyword', 'Win32Proj'], 2621 ['Keyword', 'Win32Proj'],
2622 ['RootNamespace', namespace], 2622 ['RootNamespace', namespace],
2623 ['IgnoreWarnCompileDuplicatedFilename', 'true'], 2623 ['IgnoreWarnCompileDuplicatedFilename', 'true'],
2624 ] 2624 ]
2625 ] 2625 ]
2626 2626
2627 if os.environ.get('PROCESSOR_ARCHITECTURE') == 'AMD64' or \
2628 os.environ.get('PROCESSOR_ARCHITEW6432') == 'AMD64':
2629 properties[0].append(['PreferredToolArchitecture', 'x64'])
2630
2627 if spec.get('msvs_enable_winrt'): 2631 if spec.get('msvs_enable_winrt'):
2628 properties[0].append(['DefaultLanguage', 'en-US']) 2632 properties[0].append(['DefaultLanguage', 'en-US'])
2629 properties[0].append(['AppContainerApplication', 'true']) 2633 properties[0].append(['AppContainerApplication', 'true'])
2630 properties[0].append(['ApplicationTypeRevision', '8.1']) 2634 properties[0].append(['ApplicationTypeRevision', '8.1'])
2631 2635
2632 if spec.get('msvs_enable_winphone'): 2636 if spec.get('msvs_enable_winphone'):
2633 properties[0].append(['ApplicationType', 'Windows Phone']) 2637 properties[0].append(['ApplicationType', 'Windows Phone'])
2634 else: 2638 else:
2635 properties[0].append(['ApplicationType', 'Windows Store']) 2639 properties[0].append(['ApplicationType', 'Windows Store'])
2636 2640
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
3416 action_spec.extend( 3420 action_spec.extend(
3417 # TODO(jeanluc) 'Document' for all or just if as_sources? 3421 # TODO(jeanluc) 'Document' for all or just if as_sources?
3418 [['FileType', 'Document'], 3422 [['FileType', 'Document'],
3419 ['Command', command], 3423 ['Command', command],
3420 ['Message', description], 3424 ['Message', description],
3421 ['Outputs', outputs] 3425 ['Outputs', outputs]
3422 ]) 3426 ])
3423 if additional_inputs: 3427 if additional_inputs:
3424 action_spec.append(['AdditionalInputs', additional_inputs]) 3428 action_spec.append(['AdditionalInputs', additional_inputs])
3425 actions_spec.append(action_spec) 3429 actions_spec.append(action_spec)
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