Mercurial > hg > truffle
comparison make/windows/makefiles/projectcreator.make @ 2233:15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
Summary: Updated create.bat and ProjectCreator
Reviewed-by: brutisso, stefank, ohair
author | sla |
---|---|
date | Thu, 10 Feb 2011 13:03:22 +0100 |
parents | aa6e219afbf1 |
children | 2ab52cda08e5 74e790c48cd4 |
comparison
equal
deleted
inserted
replaced
2205:b83527d0482d | 2233:15d6977f04b0 |
---|---|
1 # | 1 # |
2 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
34 | 34 |
35 ProjectCreatorSources=\ | 35 ProjectCreatorSources=\ |
36 $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTree.java \ | 36 $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTree.java \ |
37 $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTreeNode.java \ | 37 $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTreeNode.java \ |
38 $(WorkSpace)\src\share\tools\ProjectCreator\FileFormatException.java \ | 38 $(WorkSpace)\src\share\tools\ProjectCreator\FileFormatException.java \ |
39 $(WorkSpace)\src\share\tools\ProjectCreator\Macro.java \ | |
40 $(WorkSpace)\src\share\tools\ProjectCreator\MacroDefinitions.java \ | |
41 $(WorkSpace)\src\share\tools\ProjectCreator\ProjectCreator.java \ | 39 $(WorkSpace)\src\share\tools\ProjectCreator\ProjectCreator.java \ |
42 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatform.java \ | 40 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatform.java \ |
43 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC6.java \ | 41 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC6.java \ |
44 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC7.java \ | 42 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC7.java \ |
45 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC8.java \ | 43 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC8.java \ |
48 $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \ | 46 $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \ |
49 $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java | 47 $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java |
50 | 48 |
51 # This is only used internally | 49 # This is only used internally |
52 ProjectCreatorIncludesPRIVATE=\ | 50 ProjectCreatorIncludesPRIVATE=\ |
51 -relativeInclude src\closed\share\vm \ | |
52 -relativeInclude src\closed\os\windows\vm \ | |
53 -relativeInclude src\closed\os_cpu\windows_$(Platform_arch)\vm \ | |
54 -relativeInclude src\closed\cpu\$(Platform_arch)\vm \ | |
53 -relativeInclude src\share\vm \ | 55 -relativeInclude src\share\vm \ |
54 -relativeInclude src\share\vm\prims \ | 56 -relativeInclude src\share\vm\prims \ |
55 -relativeInclude src\os\windows\vm \ | 57 -relativeInclude src\os\windows\vm \ |
56 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ | 58 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ |
57 -relativeInclude src\cpu\$(Platform_arch)\vm \ | 59 -relativeInclude src\cpu\$(Platform_arch)\vm \ |
82 $(ProjectCreatorIDEOptions) \ | 84 $(ProjectCreatorIDEOptions) \ |
83 -sourceBase $(HOTSPOTWORKSPACE) \ | 85 -sourceBase $(HOTSPOTWORKSPACE) \ |
84 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ | 86 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ |
85 -startAt src \ | 87 -startAt src \ |
86 -compiler $(VcVersion) \ | 88 -compiler $(VcVersion) \ |
87 -projectFileName $(HOTSPOTBUILDROOT)\$(ProjectFile) \ | 89 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \ |
88 -jdkTargetRoot $(HOTSPOTJDKDIST) \ | 90 -jdkTargetRoot $(HOTSPOTJDKDIST) \ |
89 -define ALIGN_STACK_FRAMES \ | 91 -define ALIGN_STACK_FRAMES \ |
90 -define VM_LITTLE_ENDIAN \ | 92 -define VM_LITTLE_ENDIAN \ |
91 -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LINK_VER)" \ | 93 -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LINK_VER)" \ |
92 -postbuild "" "Building hotspot.exe..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ | 94 -postbuild "" "Building hotspot.exe..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ |
104 $(ProjectCreatorIncludesPRIVATE) | 106 $(ProjectCreatorIncludesPRIVATE) |
105 | 107 |
106 # Add in build-specific options | 108 # Add in build-specific options |
107 !if "$(BUILDARCH)" == "i486" | 109 !if "$(BUILDARCH)" == "i486" |
108 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ | 110 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
111 -platformName Win32 \ | |
109 -define IA32 \ | 112 -define IA32 \ |
110 -ignorePath x86_64 \ | 113 -ignorePath x86_64 \ |
111 -define TARGET_ARCH_MODEL_x86_32 | 114 -define TARGET_ARCH_MODEL_x86_32 |
112 !else | 115 !else |
113 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ | 116 !if "$(BUILDARCH)" == "amd64" |
117 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ | |
118 -platformName x64 \ | |
119 -define AMD64 \ | |
120 -define _LP64 \ | |
114 -ignorePath x86_32 \ | 121 -ignorePath x86_32 \ |
115 -define TARGET_ARCH_MODEL_x86_64 | 122 -define TARGET_ARCH_MODEL_x86_64 \ |
123 -define TARGET_OS_ARCH_MODEL_windows_x86_64 | |
124 !endif | |
116 !endif | 125 !endif |
117 | 126 |
118 ProjectCreatorIDEOptionsIgnoreCompiler1=\ | 127 ProjectCreatorIDEOptionsIgnoreCompiler1=\ |
119 -ignorePath_TARGET c1_ | 128 -ignorePath_TARGET c1_ |
120 | 129 |