summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-01-15 13:50:10 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-01-15 13:50:10 +0000
commit31676a3540858b3a7449484ab303c308b6fc082a (patch)
tree151becb73cbc9d0dedb904168296c9df601b1298 /util
parent6b9e941ee3a69fa1da078b730ddd9237a8a5ba50 (diff)
Update from stable branch.
Diffstat (limited to 'util')
-rw-r--r--util/pl/VC-32.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 94a1e83011..f24b9f62f0 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -285,6 +285,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);
@@ -298,8 +299,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);
}