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