equal
deleted
inserted
replaced
23 # |
23 # |
24 |
24 |
25 HS_INTERNAL_NAME=jvm |
25 HS_INTERNAL_NAME=jvm |
26 HS_FNAME=$(HS_INTERNAL_NAME).dll |
26 HS_FNAME=$(HS_INTERNAL_NAME).dll |
27 AOUT=$(HS_FNAME) |
27 AOUT=$(HS_FNAME) |
|
28 LAUNCHER_NAME=hotspot.exe |
28 GENERATED=../generated |
29 GENERATED=../generated |
29 |
30 |
30 # Allow the user to turn off precompiled headers from the command line. |
31 # Allow the user to turn off precompiled headers from the command line. |
31 !if "$(USE_PRECOMPILED_HEADER)" != "0" |
32 !if "$(USE_PRECOMPILED_HEADER)" != "0" |
32 BUILD_PCH_FILE=_build_pch_file.obj |
33 BUILD_PCH_FILE=_build_pch_file.obj |
33 !endif |
34 !endif |
34 |
35 |
35 default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA |
36 default:: $(BUILD_PCH_FILE) $(AOUT) $(LAUNCHER_NAME) checkAndBuildSA |
36 |
37 |
37 !include ../local.make |
38 !include ../local.make |
38 !include compile.make |
39 !include compile.make |
39 |
40 |
40 CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION) |
41 CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION) |
71 $(MT) /manifest $@.manifest /outputresource:$@;#2 |
72 $(MT) /manifest $@.manifest /outputresource:$@;#2 |
72 !endif |
73 !endif |
73 |
74 |
74 !include $(WorkSpace)/make/windows/makefiles/shared.make |
75 !include $(WorkSpace)/make/windows/makefiles/shared.make |
75 !include $(WorkSpace)/make/windows/makefiles/sa.make |
76 !include $(WorkSpace)/make/windows/makefiles/sa.make |
|
77 !include $(WorkSpace)/make/windows/makefiles/launcher.make |