Index: pylib/gyp/generator/msvs.py |
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py |
index 6315cc372a3d5b2b365e95829dea368aff186188..61ba02cff16c16c9dba32f6b7ebb35223f1922ad 100644 |
--- a/pylib/gyp/generator/msvs.py |
+++ b/pylib/gyp/generator/msvs.py |
@@ -1863,10 +1863,14 @@ 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) |
+ target_arch = params.get('target_arch', '') |
+ configuration = '$(Configuration)' |
+ if target_arch == 'x64': |
scottmg
2015/02/11 22:58:14
remove the separate "target_arch = ..." line and r
danduong
2015/02/11 23:26:08
Done.
|
+ 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, |