From 31676a3540858b3a7449484ab303c308b6fc082a Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 15 Jan 2006 13:50:10 +0000 Subject: [PATCH] Update from stable branch. --- CHANGES | 3 +++ util/pl/VC-32.pl | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c3a7848930..4ad5481072 100644 --- a/CHANGES +++ b/CHANGES @@ -117,6 +117,9 @@ Changes between 0.9.8a and 0.9.8b [XX xxx XXXX] + *) Link in manifests for VC++ if needed. + [Austin Ziegler ] + *) 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 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); } -- GitLab