Mercurial > hg > truffle

comparison make/windows/makefiles/product.make @ 1985:cb2d0a362639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6981484: Update development launcher Summary: Add new development launcher called hotspot(.exe) Reviewed-by: coleenp
author sla
date Thu, 02 Dec 2010 05:45:54 -0800
parents c760f78e0a53
children aa6e219afbf1
comparison
equal deleted inserted replaced
1984:2968675b413e 1985:cb2d0a362639
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