1.1 --- a/make/windows/makefiles/launcher.make Tue Dec 14 15:10:52 2010 -0500
1.2 +++ b/make/windows/makefiles/launcher.make Wed Dec 15 07:11:31 2010 -0800
1.3 @@ -22,7 +22,8 @@
1.4 #
1.5 #
1.6
1.7 -LAUNCHER_FLAGS=$(ARCHFLAG) \
1.8 +
1.9 +LAUNCHER_FLAGS=$(CPP_FLAGS) $(ARCHFLAG) \
1.10 /D FULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
1.11 /D JDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
1.12 /D JDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \
1.13 @@ -32,9 +33,11 @@
1.14 /D _CRT_SECURE_NO_DEPRECATE \
1.15 /D LINK_INTO_LIBJVM \
1.16 /I $(WorkSpace)\src\os\windows\launcher \
1.17 - /I $(WorkSpace)\src\share\tools\launcher
1.18 -
1.19 -CPP_FLAGS=$(CPP_FLAGS) $(LAUNCHER_FLAGS)
1.20 + /I $(WorkSpace)\src\share\tools\launcher \
1.21 + /I $(WorkSpace)\src\share\vm\prims \
1.22 + /I $(WorkSpace)\src\share\vm \
1.23 + /I $(WorkSpace)\src\cpu\$(Platform_arch)\vm \
1.24 + /I $(WorkSpace)\src\os\windows\vm
1.25
1.26 LINK_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console
1.27
1.28 @@ -46,22 +49,23 @@
1.29 LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB)
1.30 !endif
1.31
1.32 -LAUNCHERDIR = $(GAMMADIR)/src/os/windows/launcher
1.33 -LAUNCHERDIR_SHARE = $(GAMMADIR)/src/share/tools/launcher
1.34 +LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher
1.35 +LAUNCHERDIR_SHARE = $(WorkSpace)/src/share/tools/launcher
1.36
1.37 OUTDIR = launcher
1.38
1.39 {$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj:
1.40 - -mkdir $(OUTDIR)
1.41 - $(CPP) $(CPP_FLAGS) /c /Fo$@ $<
1.42 + -mkdir $(OUTDIR) 2>NUL >NUL
1.43 + $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
1.44
1.45 {$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj:
1.46 - -mkdir $(OUTDIR)
1.47 - $(CPP) $(CPP_FLAGS) /c /Fo$@ $<
1.48 + -mkdir $(OUTDIR) 2>NUL >NUL
1.49 + $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
1.50
1.51 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h
1.52
1.53 -$(LAUNCHER_NAME): $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj
1.54 - $(LINK) $(LINK_FLAGS) /out:$@ $**
1.55 +launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj
1.56 + echo $(JAVA_HOME) > jdkpath.txt
1.57 + $(LINK) $(LINK_FLAGS) /out:hotspot.exe $**
1.58
1.59
