equal
deleted
inserted
replaced
49 HS_BUILD_ID=$(HOTSPOT_VERSION_STRING) |
49 HS_BUILD_ID=$(HOTSPOT_VERSION_STRING) |
50 |
50 |
51 # Force resources to be rebuilt every time |
51 # Force resources to be rebuilt every time |
52 $(Res_Files): FORCE |
52 $(Res_Files): FORCE |
53 |
53 |
|
54 # NOTE: Changes in this file was just to give a proper command line when linking |
|
55 # for use when developing the new build, and should not be integrated. |
54 $(AOUT): $(Res_Files) $(Obj_Files) vm.def |
56 $(AOUT): $(Res_Files) $(Obj_Files) vm.def |
55 $(LD) @<< |
57 $(LD) $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) |
56 $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) |
58 |
57 << |
|
58 !if "$(MT)" != "" |
59 !if "$(MT)" != "" |
59 # The previous link command created a .manifest file that we want to |
60 # The previous link command created a .manifest file that we want to |
60 # insert into the linked artifact so we do not need to track it |
61 # insert into the linked artifact so we do not need to track it |
61 # separately. Use ";#2" for .dll and ";#1" for .exe: |
62 # separately. Use ";#2" for .dll and ";#1" for .exe: |
62 $(MT) /manifest $@.manifest /outputresource:$@;#2 |
63 $(MT) /manifest $@.manifest /outputresource:$@;#2 |