pylib/gyp/generator/msvs.py - Issue 880813004: Make msvs-ninja work for target_arch=x64

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pylib/gyp/generator/msvs.py

Issue 880813004: Make msvs-ninja work for target_arch=x64 (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master

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:

Index: pylib/gyp/generator/msvs.py

diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py

index 6315cc372a3d5b2b365e95829dea368aff186188..5b58dd141a0fceb183e1e30569c3366c85b1dd1d 100644

--- a/pylib/gyp/generator/msvs.py

+++ b/pylib/gyp/generator/msvs.py

@@ -1863,10 +1863,13 @@ def _InitNinjaFlavor(params, target_list, target_dicts):

if not spec.get('msvs_external_builder_out_dir'):

gyp_file, _, _ = gyp.common.ParseQualifiedTarget(qualified_target)

gyp_dir = os.path.dirname(gyp_file)

+ configuration = '$(Configuration)'

+ if params.get('target_arch') == 'x64':

+ configuration += '_x64'

spec['msvs_external_builder_out_dir'] = os.path.join(

gyp.common.RelativePath(params['options'].toplevel_dir, gyp_dir),

ninja_generator.ComputeOutputDir(params),

- '$(Configuration)')

+ configuration)

if not spec.get('msvs_external_builder_build_cmd'):

spec['msvs_external_builder_build_cmd'] = [

path_to_ninja,

« no previous file with comments | « pylib/gyp/__init__.py ('k') | no next file » | no next file with comments »