Make msvs-ninja work for target_arch=x64

pylib/gyp/generator/msvs.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import ntpath
 import os
 import posixpath
 import re
 import subprocess
@@ skipping 1845 matching lines @@
     if spec.get('msvs_external_builder'):
       # The spec explicitly defined an external builder, so don't change it.
       continue
 
     path_to_ninja = spec.get('msvs_path_to_ninja', 'ninja.exe')
 
     spec['msvs_external_builder'] = 'ninja'
     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,
         '-C',
         '$(OutDir)',
         '$(ProjectName)',
       ]
     if not spec.get('msvs_external_builder_clean_cmd'):
       spec['msvs_external_builder_clean_cmd'] = [
         path_to_ninja,
@@ skipping 1525 matching lines @@
   action_spec.extend(
       # TODO(jeanluc) 'Document' for all or just if as_sources?
       [['FileType', 'Document'],
        ['Command', command],
        ['Message', description],
        ['Outputs', outputs]
       ])
   if additional_inputs:
     action_spec.append(['AdditionalInputs', additional_inputs])
   actions_spec.append(action_spec)