37 /I $(WorkSpace)\src\share\vm\prims \ |
37 /I $(WorkSpace)\src\share\vm\prims \ |
38 /I $(WorkSpace)\src\share\vm \ |
38 /I $(WorkSpace)\src\share\vm \ |
39 /I $(WorkSpace)\src\cpu\$(Platform_arch)\vm \ |
39 /I $(WorkSpace)\src\cpu\$(Platform_arch)\vm \ |
40 /I $(WorkSpace)\src\os\windows\vm |
40 /I $(WorkSpace)\src\os\windows\vm |
41 |
41 |
42 LINK_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console |
42 LD_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console |
43 |
43 |
44 !if "$(COMPILER_NAME)" == "VS2005" |
44 !if "$(COMPILER_NAME)" == "VS2005" |
45 # 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 |
46 # on the link command line, otherwise we get missing __security_check_cookie |
46 # on the link command line, otherwise we get missing __security_check_cookie |
47 # externals at link time. Even with /GS-, you need bufferoverflowU.lib. |
47 # externals at link time. Even with /GS-, you need bufferoverflowU.lib. |
48 BUFFEROVERFLOWLIB = bufferoverflowU.lib |
48 BUFFEROVERFLOWLIB = bufferoverflowU.lib |
49 LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB) |
49 LD_FLAGS = $(LD_FLAGS) $(BUFFEROVERFLOWLIB) |
50 !endif |
50 !endif |
51 |
51 |
52 !if "$(COMPILER_NAME)" == "VS2010" && "$(BUILDARCH)" == "i486" |
52 !if "$(COMPILER_NAME)" == "VS2010" && "$(BUILDARCH)" == "i486" |
53 LINK_FLAGS = /SAFESEH $(LINK_FLAGS) |
53 LD_FLAGS = /SAFESEH $(LD_FLAGS) |
54 !endif |
54 !endif |
55 |
55 |
56 LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher |
56 LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher |
57 LAUNCHERDIR_SHARE = $(WorkSpace)/src/share/tools/launcher |
57 LAUNCHERDIR_SHARE = $(WorkSpace)/src/share/tools/launcher |
58 |
58 |
59 OUTDIR = launcher |
59 OUTDIR = launcher |
60 |
60 |
61 {$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj: |
61 {$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj: |
62 -mkdir $(OUTDIR) 2>NUL >NUL |
62 -mkdir $(OUTDIR) 2>NUL >NUL |
63 $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $< |
63 $(CXX) $(LAUNCHER_FLAGS) /c /Fo$@ $< |
64 |
64 |
65 {$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj: |
65 {$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj: |
66 -mkdir $(OUTDIR) 2>NUL >NUL |
66 -mkdir $(OUTDIR) 2>NUL >NUL |
67 $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $< |
67 $(CXX) $(LAUNCHER_FLAGS) /c /Fo$@ $< |
68 |
68 |
69 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h |
69 $(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h |
70 |
70 |
71 launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj |
71 launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj |
72 echo $(JAVA_HOME) > jdkpath.txt |
72 echo $(JAVA_HOME) > jdkpath.txt |
73 $(LINK) $(LINK_FLAGS) /out:hotspot.exe $** |
73 $(LD) $(LD_FLAGS) /out:hotspot.exe $** |