1.1 --- a/make/windows/makefiles/debug.make Fri Nov 07 13:55:14 2008 -0800 1.2 +++ b/make/windows/makefiles/debug.make Tue Nov 11 22:01:08 2008 -0800 1.3 @@ -50,6 +50,12 @@ 1.4 $(LINK) @<< 1.5 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 1.6 << 1.7 +!if "$(MT)" != "" 1.8 +# The previous link command created a .manifest file that we want to 1.9 +# insert into the linked artifact so we do not need to track it 1.10 +# separately. Use ";#2" for .dll and ";#1" for .exe: 1.11 + $(MT) /manifest $@.manifest /outputresource:$@;#2 1.12 +!endif 1.13 1.14 !include $(WorkSpace)/make/windows/makefiles/shared.make 1.15 !include $(WorkSpace)/make/windows/makefiles/sa.make