From: Dr. Stephen Henson Date: Thu, 5 Jun 2008 10:56:51 +0000 (+0000) Subject: Update from HEAD. X-Git-Tag: OpenSSL_0_9_8i~59 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f35f7d9fbb77554379b55f666aeec6c64f365263;p=oweals%2Fopenssl.git Update from HEAD. --- diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 6f986fdb3e..bd4f0afb44 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -139,6 +139,7 @@ if ($FLAVOR =~ /CE/) else { $ex_libs.=' gdi32.lib advapi32.lib user32.lib'; + $ex_libs.=' cryptui.lib' if $cflags =~ /-DOPENSSL_CAPIENG_DIALOG/; $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); } @@ -273,7 +274,14 @@ sub do_lib_rule if ($name eq "") { $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); - $ex.=' crypt32.lib advapi32.lib' if ($target =~ /capi/); + if ($target =~ /capi/) + { + $ex.=' crypt32.lib advapi32.lib'; + if ($cflags =~ /-DOPENSSL_CAPIENG_DIALOG/) + { + $ex.=' cryptui.lib'; + } + } } elsif ($FLAVOR =~ /CE/) { @@ -284,6 +292,7 @@ sub do_lib_rule $ex.=' unicows.lib' if ($FLAVOR =~ /NT/); $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; $ex.=' crypt32.lib'; + $ex.=' cryptui.lib' if $cflags =~ /-DOPENSSL_CAPIENG_DIALOG/; $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); } $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;