make/windows/makefiles/launcher.make

changeset 2369
aa6e219afbf1
parent 2327
cb2d0a362639
child 2590
99bd05619fa4
equal deleted inserted replaced
2367:b03e6b4c7c75 2369:aa6e219afbf1
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 LAUNCHER_FLAGS=$(ARCHFLAG) \ 25
26 LAUNCHER_FLAGS=$(CPP_FLAGS) $(ARCHFLAG) \
26 /D FULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \ 27 /D FULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
27 /D JDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \ 28 /D JDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
28 /D JDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \ 29 /D JDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \
29 /D GAMMA \ 30 /D GAMMA \
30 /D LAUNCHER_TYPE=\"gamma\" \ 31 /D LAUNCHER_TYPE=\"gamma\" \
31 /D _CRT_SECURE_NO_WARNINGS \ 32 /D _CRT_SECURE_NO_WARNINGS \
32 /D _CRT_SECURE_NO_DEPRECATE \ 33 /D _CRT_SECURE_NO_DEPRECATE \
33 /D LINK_INTO_LIBJVM \ 34 /D LINK_INTO_LIBJVM \
34 /I $(WorkSpace)\src\os\windows\launcher \ 35 /I $(WorkSpace)\src\os\windows\launcher \
35 /I $(WorkSpace)\src\share\tools\launcher 36 /I $(WorkSpace)\src\share\tools\launcher \
36 37 /I $(WorkSpace)\src\share\vm\prims \
37 CPP_FLAGS=$(CPP_FLAGS) $(LAUNCHER_FLAGS) 38 /I $(WorkSpace)\src\share\vm \
39 /I $(WorkSpace)\src\cpu\$(Platform_arch)\vm \
40 /I $(WorkSpace)\src\os\windows\vm
38 41
39 LINK_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console 42 LINK_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console
40 43
41 !if "$(COMPILER_NAME)" == "VS2005" 44 !if "$(COMPILER_NAME)" == "VS2005"
42 # This VS2005 compiler has /GS as a default and requires bufferoverflowU.lib 45 # This VS2005 compiler has /GS as a default and requires bufferoverflowU.lib
44 # externals at link time. Even with /GS-, you need bufferoverflowU.lib. 47 # externals at link time. Even with /GS-, you need bufferoverflowU.lib.
45 BUFFEROVERFLOWLIB = bufferoverflowU.lib 48 BUFFEROVERFLOWLIB = bufferoverflowU.lib
46 LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB) 49 LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB)
47 !endif 50 !endif
48 51
49 LAUNCHERDIR = $(GAMMADIR)/src/os/windows/launcher 52 LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher
50 LAUNCHERDIR_SHARE = $(GAMMADIR)/src/share/tools/launcher 53 LAUNCHERDIR_SHARE = $(WorkSpace)/src/share/tools/launcher
51 54
52 OUTDIR = launcher 55 OUTDIR = launcher
53 56
54 {$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj: 57 {$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj:
55 -mkdir $(OUTDIR) 58 -mkdir $(OUTDIR) 2>NUL >NUL
56 $(CPP) $(CPP_FLAGS) /c /Fo$@ $< 59 $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
57 60
58 {$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj: 61 {$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj:
59 -mkdir $(OUTDIR) 62 -mkdir $(OUTDIR) 2>NUL >NUL
60 $(CPP) $(CPP_FLAGS) /c /Fo$@ $< 63 $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
61 64
62 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h 65 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h
63 66
64 $(LAUNCHER_NAME): $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj 67 launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj
65 $(LINK) $(LINK_FLAGS) /out:$@ $** 68 echo $(JAVA_HOME) > jdkpath.txt
69 $(LINK) $(LINK_FLAGS) /out:hotspot.exe $**
66 70
67 71

mercurial