comparison 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
comparison
equal deleted inserted replaced
1407:09e7826ecf01 1408:0ba67bb5392c
49 "SccLocalPath", "" 49 "SccLocalPath", ""
50 } 50 }
51 ); 51 );
52 52
53 startTag("Platforms", null); 53 startTag("Platforms", null);
54 tag("Platform", new String[] {"Name", Util.os}); 54 tag("Platform", new String[] {"Name", Util.os()});
55 endTag("Platforms"); 55 endTag("Platforms");
56 56
57 startTag("Configurations", null); 57 startTag("Configurations", null);
58 58
59 for (Iterator i = allConfigs.iterator(); i.hasNext(); ) { 59 for (Iterator i = allConfigs.iterator(); i.hasNext(); ) {
467 new String[] { 467 new String[] {
468 "Name", "VCMIDLTool", 468 "Name", "VCMIDLTool",
469 "PreprocessorDefinitions", "NDEBUG", 469 "PreprocessorDefinitions", "NDEBUG",
470 "MkTypLibCompatible", "TRUE", 470 "MkTypLibCompatible", "TRUE",
471 "SuppressStartupBanner", "TRUE", 471 "SuppressStartupBanner", "TRUE",
472 "TargetEnvironment", "1", 472 "TargetEnvironment", Util.os().equals("Win32") ? "1" : "3",
473 "TypeLibraryName", cfg.get("OutputDir") + Util.sep + "vm.tlb", 473 "TypeLibraryName", cfg.get("OutputDir") + Util.sep + "vm.tlb",
474 "HeaderFileName", "" 474 "HeaderFileName", ""
475 } 475 }
476 ); 476 );
477 477
609 // Set /SUBSYSTEM option. 2 is subSystemWindows 609 // Set /SUBSYSTEM option. 2 is subSystemWindows
610 addAttr(rv, "SubSystem", "2"); 610 addAttr(rv, "SubSystem", "2");
611 addAttr(rv, "BaseAddress", "0x8000000"); 611 addAttr(rv, "BaseAddress", "0x8000000");
612 addAttr(rv, "ImportLibrary", outDir+Util.sep+"jvm.lib"); 612 addAttr(rv, "ImportLibrary", outDir+Util.sep+"jvm.lib");
613 // Set /MACHINE option. 1 is machineX86 613 // Set /MACHINE option. 1 is machineX86
614 addAttr(rv, "TargetMachine", "1"); 614 addAttr(rv, "TargetMachine", Util.os().equals("Win32") ? "1" : "17");
615 615
616 return rv; 616 return rv;
617 } 617 }
618 618
619 void getDebugCompilerFlags_common(String opt,Vector rv) { 619 void getDebugCompilerFlags_common(String opt,Vector rv) {
687 String getNoOptFlag() { 687 String getNoOptFlag() {
688 return "0"; 688 return "0";
689 } 689 }
690 690
691 String makeCfgName(String flavourBuild) { 691 String makeCfgName(String flavourBuild) {
692 return flavourBuild + "|" + Util.os; 692 return flavourBuild + "|" + Util.os();
693 } 693 }
694 } 694 }