From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 15 Jan 2006 13:46:20 +0000 (+0000)
Subject: Handle manifest files for VC++
X-Git-Tag: OpenSSL_0_9_8b~42
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=217382d5842135a26e45447db9c8da274760948d;p=oweals%2Fopenssl.git

Handle manifest files for VC++

Submitted by: Austin Ziegler <halostatue@gmail.com>
---

diff --git a/CHANGES b/CHANGES
index 2a20a223d6..fd370b6ef6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.8a and 0.9.8b  [XX xxx XXXX]
 
+  *) Link in manifests for VC++ if needed.
+     [Austin Ziegler <halostatue@gmail.com>]
+
   *) Update support for ECC-based TLS ciphersuites according to
      draft-ietf-tls-ecc-12.txt with proposed changes.
      [Douglas Stebila]
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index d946ce4a3a..81e92f0ad4 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -275,6 +275,7 @@ sub do_lib_rule
 			}
 		$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
 		$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+        $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;2\n\n";
 		}
 	$ret.="\n";
 	return($ret);
@@ -288,8 +289,9 @@ sub do_link_rule
 	$file =~ s/\//$o/g if $o ne '/';
 	$n=&bname($targer);
 	$ret.="$target: $files $dep_libs\n";
-	$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
-	$ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n\n";
+	$ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
+	$ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
+    $ret.="\tIF EXIST \$@.manifest mt -manifest \$@.manifest -outputresource:\$@;1\n\n";
 	return($ret);
 	}