Mercurial > hg > truffle

diff make/windows/makefiles/fastdebug.make @ 444:ab42bab113e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Fri, 21 Nov 2008 16:11:03 -0800
parents 3c07cda72b7d
children c18cbe5936b8
line wrap: on
line diff
--- a/make/windows/makefiles/fastdebug.make	Thu Nov 20 11:39:38 2008 -0800
+++ b/make/windows/makefiles/fastdebug.make	Fri Nov 21 16:11:03 2008 -0800
@@ -50,6 +50,13 @@
 	$(LINK) @<<
   $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
 <<
+!if "$(MT)" != ""
+# The previous link command created a .manifest file that we want to
+# insert into the linked artifact so we do not need to track it
+# separately.  Use ";#2" for .dll and ";#1" for .exe:
+	$(MT) /manifest $@.manifest /outputresource:$@;#2
+!endif
+
 
 !include $(WorkSpace)/make/windows/makefiles/shared.make
 !include $(WorkSpace)/make/windows/makefiles/sa.make