summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-06-05 10:56:51 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-06-05 10:56:51 +0000
commitf35f7d9fbb77554379b55f666aeec6c64f365263 (patch)
treec58a727ff5847be2f2f38af4f4b333800d84bd3f /util
parentdfbf646ac4680d6ef3602b22563a6a17b8760a16 (diff)
Update from HEAD.
Diffstat (limited to 'util')
-rw-r--r--util/pl/VC-32.pl11
1 files changed, 10 insertions, 1 deletions
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/;