src/share/tools/ProjectCreator/WinGammaPlatformVC6.java

rev 2073 : imported patch vcproj-64

*** 221,240 ****
          rv.add("ADD CPP /Yu\"incls/_precompiled.incl\"");
  
          return rv;
      }
  
!     Vector getBaseLinkerFlags(String outDir, String outDll) {
          Vector rv = new Vector();
  
          rv.add("PROP Ignore_Export_Lib 0");
          rv.add("ADD BASE CPP /MD");
          rv.add("ADD CPP /MD");
          rv.add("ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib " +
                 "           advapi32.lib shell32.lib ole32.lib oleaut32.lib winmm.lib");
          rv.add("ADD LINK32      /out:\""+outDll+"\" "+
!                "                /nologo /subsystem:windows /machine:I386" +
                 "                /nologo /base:\"0x8000000\" /subsystem:windows /dll" +
                 "                /export:JNI_GetDefaultJavaVMInitArgs /export:JNI_CreateJavaVM /export:JNI_GetCreatedJavaVMs "+
                 "                /export:jio_snprintf /export:jio_printf /export:jio_fprintf /export:jio_vfprintf "+
                 "                /export:jio_vsnprintf ");
          rv.add("SUBTRACT LINK32 /pdb:none /map");
--- 221,244 ----
          rv.add("ADD CPP /Yu\"incls/_precompiled.incl\"");
  
          return rv;
      }
  
!     Vector getBaseLinkerFlags(String outDir, String outDll, String platformName) {
          Vector rv = new Vector();
  
          rv.add("PROP Ignore_Export_Lib 0");
          rv.add("ADD BASE CPP /MD");
          rv.add("ADD CPP /MD");
          rv.add("ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib " +
                 "           advapi32.lib shell32.lib ole32.lib oleaut32.lib winmm.lib");
+         String machine = "/machine:I386";
+         if (platformName.equals("x64")) {
+                 machine = "/machine:X64";
+         }
          rv.add("ADD LINK32      /out:\""+outDll+"\" "+
!                "                /nologo /subsystem:windows /machine:" + machine +
                 "                /nologo /base:\"0x8000000\" /subsystem:windows /dll" +
                 "                /export:JNI_GetDefaultJavaVMInitArgs /export:JNI_CreateJavaVM /export:JNI_GetCreatedJavaVMs "+
                 "                /export:jio_snprintf /export:jio_printf /export:jio_fprintf /export:jio_vfprintf "+
                 "                /export:jio_vsnprintf ");
          rv.add("SUBTRACT LINK32 /pdb:none /map");
*** 285,293 ****
  
      String getNoOptFlag() {
          return "d";
      }
  
!     String makeCfgName(String flavourBuild) {
!         return "vm - "+ Util.os + " " + flavourBuild;
      }
  }
--- 289,297 ----
  
      String getNoOptFlag() {
          return "d";
      }
  
!     String makeCfgName(String flavourBuild, String platform) {
!         return "vm - "+ platform + " " + flavourBuild;
      }
  }