comparison make/windows/makefiles/product.make @ 2027:aa6e219afbf1

7006354: Updates to Visual Studio project creation and development launcher Summary: Updates to Visual Studio project creation and development launcher Reviewed-by: stefank, coleenp
author sla
date Wed, 15 Dec 2010 07:11:31 -0800
parents cb2d0a362639
children 719f7007c8e8
comparison
equal deleted inserted replaced
2025:b03e6b4c7c75 2027:aa6e219afbf1
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
29 GENERATED=../generated 28 GENERATED=../generated
30 29
31 # Allow the user to turn off precompiled headers from the command line. 30 # Allow the user to turn off precompiled headers from the command line.
32 !if "$(USE_PRECOMPILED_HEADER)" != "0" 31 !if "$(USE_PRECOMPILED_HEADER)" != "0"
33 BUILD_PCH_FILE=_build_pch_file.obj 32 BUILD_PCH_FILE=_build_pch_file.obj
34 !endif 33 !endif
35 34
36 default:: $(BUILD_PCH_FILE) $(AOUT) $(LAUNCHER_NAME) checkAndBuildSA 35 default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
37 36
38 !include ../local.make 37 !include ../local.make
39 !include compile.make 38 !include compile.make
40 39
41 CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION) 40 CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION)
57 $(AOUT): $(Res_Files) $(Obj_Files) 56 $(AOUT): $(Res_Files) $(Obj_Files)
58 $(LINK) @<< 57 $(LINK) @<<
59 $(LINK_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files) 58 $(LINK_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files)
60 << 59 <<
61 !else 60 !else
62 $(AOUT): $(Res_Files) $(Obj_Files) 61 vm.def: $(Obj_Files)
63 sh $(WorkSpace)/make/windows/build_vm_def.sh 62 sh $(WorkSpace)/make/windows/build_vm_def.sh
63
64 $(AOUT): $(Res_Files) $(Obj_Files) vm.def
64 $(LINK) @<< 65 $(LINK) @<<
65 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 66 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
66 << 67 <<
67 !endif 68 !endif
68 !if "$(MT)" != "" 69 !if "$(MT)" != ""