Modify GYP scripts for VC build

1 files changed, 10 insertions, 10 deletions

diff --git a/tools/gyp_node b/tools/gyp_node
index f373312a36..6bd640cfae 100755
--- a/tools/gyp_node
+++ b/tools/gyp_node
@@ -4,17 +4,16 @@ import os
 import shlex
 import sys
 
-tool_dir = os.path.dirname(__file__)
-node_root = os.path.normpath(os.path.join(tool_dir, os.pardir))
+script_dir = os.path.dirname(__file__)
+node_root  = os.path.normpath(os.path.join(script_dir, os.pardir))
 
-sys.path.insert(0, os.path.join(tool_dir, 'gyp', 'pylib'))
+sys.path.insert(0, os.path.join(node_root, 'tools', 'gyp', 'pylib'))
 import gyp
 
 # Directory within which we want all generated files (including Makefiles)
 # to be written.
 output_dir = os.path.join(os.path.abspath(node_root), 'out')
 
-
 def run_gyp(args):
   rc = gyp.main(args)
   if rc != 0:
@@ -23,16 +22,17 @@ def run_gyp(args):
 
 if __name__ == '__main__':
   args = sys.argv[1:]
-  args.append(os.path.join(tool_dir, 'all.gyp'))
+  args.append(os.path.join(script_dir, 'all.gyp'))
   args.append('--depth=' + node_root)
 
-  # Tell gyp to write the Makefiles into output_dir
-  args.extend(['--generator-output', output_dir])
+  if sys.platform != 'win32':
+    # Tell gyp to write the Makefiles into output_dir
+    args.extend(['--generator-output', output_dir])
 
-  # Tell make to write its output into the same dir
-  args.extend(['-Goutput_dir=' + output_dir])
+    # Tell make to write its output into the same dir
+    args.extend(['-Goutput_dir=' + output_dir])
 
-  args.append('-Dtarget_arch=x64')
+  args.append('-Dtarget_arch=ia32')
   args.append('-Dcomponent=static_library')
   args.append('-Dlibrary=static_library')
   gyp_args = list(args)