From d9ce5913a04fb77db5b89740197ac9aa63dae0f4 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Wed, 25 May 2005 19:03:32 +0000
Subject: [PATCH] manifest generation

[SVN r29192]
---
 v2/tools/msvc.jam | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/v2/tools/msvc.jam b/v2/tools/msvc.jam
index 73ae32601..798ba6759 100644
--- a/v2/tools/msvc.jam
+++ b/v2/tools/msvc.jam
@@ -153,10 +153,12 @@ rule init (
     }
     
     # 8.0 deprecates some of the options
-    if [ MATCH ^(8) : $(version) ]
+    if ! [ MATCH ^([67]\..*) : $(version) ] 
     {
         flags msvc.compile CFLAGS $(condition)/<optimization>speed : /O2 ;
         flags msvc.compile CFLAGS $(condition)/<optimization>space : /O1 ;
+        flags msvc.link.dll MANIFEST : "mt -manifest " ;
+        flags msvc.link.dll OUTPUTRESOURCE : "-outputresource:" ;
     }
     else
     {        
@@ -358,6 +360,7 @@ actions link bind DEF_FILE
 actions link.dll bind DEF_FILE
 {
     $(.LD) /NOLOGO $(LINKFLAGS) /out:"$(<[1]:W)" /INCREMENTAL:NO /IMPLIB:"$(<[2]:W)" /LIBPATH:"$(LINKPATH:W)" /def:$(DEF_FILE) $(USER_LINKFLAGS) @"$(<[3]:W)"
+    $(MANIFEST)$(<[1]).manifest $(OUTPUTRESOURCE)$(<[1]);#2
 }
 
 rule compile.c++ ( targets + : sources * : properties * )