Mercurial > hg > truffle

comparison make/windows/makefiles/projectcreator.make @ 4970:33df1aeaebbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 76841bdd5f3e 719f7007c8e8
children 25c4d10b0728
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
56 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ 56 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \
57 -relativeInclude src\cpu\$(Platform_arch)\vm \ 57 -relativeInclude src\cpu\$(Platform_arch)\vm \
58 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \ 58 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \
59 -ignorePath $(HOTSPOTBUILDSPACE)/%f/generated \ 59 -ignorePath $(HOTSPOTBUILDSPACE)/%f/generated \
60 -ignorePath src\share\vm\adlc \ 60 -ignorePath src\share\vm\adlc \
61 -ignorePath src\share\vm\shark 61 -ignorePath src\share\vm\shark \
62 -ignorePath posix
62 63
63 # This is referenced externally by both the IDE and batch builds 64 # This is referenced externally by both the IDE and batch builds
64 ProjectCreatorOptions= 65 ProjectCreatorOptions=
65 66
66 # This is used externally, but only by the IDE builds, so we can 67 # This is used externally, but only by the IDE builds, so we can
86 -compiler $(VcVersion) \ 87 -compiler $(VcVersion) \
87 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \ 88 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \
88 -jdkTargetRoot $(HOTSPOTJDKDIST) \ 89 -jdkTargetRoot $(HOTSPOTJDKDIST) \
89 -define ALIGN_STACK_FRAMES \ 90 -define ALIGN_STACK_FRAMES \
90 -define VM_LITTLE_ENDIAN \ 91 -define VM_LITTLE_ENDIAN \
91 -prelink "" "Generating vm.def..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LINK_VER)" \ 92 -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \
92 -postbuild "" "Building hotspot.exe..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ 93 -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" \
93 -ignoreFile jsig.c \ 94 -ignoreFile jsig.c \
94 -ignoreFile jvmtiEnvRecommended.cpp \ 95 -ignoreFile jvmtiEnvRecommended.cpp \
95 -ignoreFile jvmtiEnvStub.cpp \ 96 -ignoreFile jvmtiEnvStub.cpp \
96 -ignoreFile globalDefinitions_gcc.hpp \ 97 -ignoreFile globalDefinitions_gcc.hpp \
97 -ignoreFile globalDefinitions_sparcWorks.hpp \ 98 -ignoreFile globalDefinitions_sparcWorks.hpp \