Mercurial > hg > graal-compiler

diff src/share/tools/MakeDeps/WinGammaPlatformVC7.java @ 1408:0ba67bb5392c
added c1x build directory, added MSVC Win64 project support
author: lstadler
date: Wed, 12 May 2010 15:01:05 +0200
parents: 35069ca331f2
children: 2d26b0046e0d
--- a/src/share/tools/MakeDeps/WinGammaPlatformVC7.java	Tue May 11 19:24:14 2010 +0200
+++ b/src/share/tools/MakeDeps/WinGammaPlatformVC7.java	Wed May 12 15:01:05 2010 +0200
@@ -51,7 +51,7 @@
             );
 
         startTag("Platforms", null);
-        tag("Platform", new String[] {"Name", Util.os});
+        tag("Platform", new String[] {"Name", Util.os()});
         endTag("Platforms");
 
         startTag("Configurations", null);
@@ -469,7 +469,7 @@
                 "PreprocessorDefinitions", "NDEBUG",
                 "MkTypLibCompatible", "TRUE",
                 "SuppressStartupBanner", "TRUE",
-                "TargetEnvironment", "1",
+                "TargetEnvironment", Util.os().equals("Win32") ? "1" : "3",
                 "TypeLibraryName", cfg.get("OutputDir") + Util.sep + "vm.tlb",
                 "HeaderFileName", ""
             }
@@ -611,7 +611,7 @@
         addAttr(rv, "BaseAddress", "0x8000000");
         addAttr(rv, "ImportLibrary", outDir+Util.sep+"jvm.lib");
         // Set /MACHINE option. 1 is machineX86
-        addAttr(rv, "TargetMachine", "1");
+        addAttr(rv, "TargetMachine", Util.os().equals("Win32") ? "1" : "17");
 
         return rv;
     }
@@ -689,6 +689,6 @@
     }
 
     String makeCfgName(String flavourBuild) {
-        return  flavourBuild + "|" + Util.os;
+        return  flavourBuild + "|" + Util.os();
     }
 }