Support MASM in MSBuild and Winja

test/win/masm/masm.gyp

Index: test/win/masm/masm.gyp
diff --git a/test/configurations/x64/configurations.gyp b/test/win/masm/masm.gyp
similarity index 50%
copy from test/configurations/x64/configurations.gyp
copy to test/win/masm/masm.gyp
index 8b0139f1418904c862c8bbeae23a68dedb56aad0..21547311fc0caffe932382b02fb51ac3da1fef78 100644
--- a/test/configurations/x64/configurations.gyp
+++ b/test/win/masm/masm.gyp
@@ -1,38 +1,48 @@
-# Copyright (c) 2009 Google Inc. All rights reserved.
+# Copyright (c) 2013 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.
 
 {
   'target_defaults': {
+    'variables': {
+      'test_defines%': 0
+    },
+    'conditions': [
+      ['test_defines == 1', {
+        'defines': [
+          'MEANING_OF_LIFE'
+        ],
+      }],
+    ],
     'configurations': {
-      'Debug': {
-        'msvs_configuration_platform': 'Win32',
+      'Default': {
       },
-      'Debug_x64': {
-        'inherit_from': ['Debug'],
+      'Default_x64': {
         'msvs_configuration_platform': 'x64',
       },
     },
   },
   'targets': [
     {
-      'target_name': 'configurations',
+      'target_name': 'hello_x86',
       'type': 'executable',
       'sources': [
-        'configurations.c',
+        'hello.cc',
+        'dummyfunc-x86.asm',
       ],
     },
     {
-      'target_name': 'configurations64',
+      'target_name': 'hello_x64',
       'type': 'executable',
       'sources': [
-        'configurations.c',
+        'hello.cc',
+        'dummyfunc-x64.asm',
       ],
       'configurations': {
-        'Debug': {
+        'Default': {
           'msvs_target_platform': 'x64',
         },
       },
     },
-  ],
+  ]
 }