projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52c3f23
)
Update from head.
author
Dr. Stephen Henson
<steve@openssl.org>
Fri, 6 Jun 2008 20:48:57 +0000
(20:48 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Fri, 6 Jun 2008 20:48:57 +0000
(20:48 +0000)
util/pl/VC-32.pl
patch
|
blob
|
history
diff --git
a/util/pl/VC-32.pl
b/util/pl/VC-32.pl
index 0b01fd62f59d26412e7edb2611eb5548670df847..1e254119e6a55f3e2591996e87b62213c7de6c5a 100644
(file)
--- a/
util/pl/VC-32.pl
+++ b/
util/pl/VC-32.pl
@@
-139,7
+139,6
@@
if ($FLAVOR =~ /CE/)
else
{
$ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
else
{
$ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
- $ex_libs.=' cryptui.lib' if $OPTIONS =~ /-DOPENSSL_CAPIENG_DIALOG/;
$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
}
$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
}
@@
-277,10
+276,6
@@
sub do_lib_rule
if ($target =~ /capi/)
{
$ex.=' crypt32.lib advapi32.lib';
if ($target =~ /capi/)
{
$ex.=' crypt32.lib advapi32.lib';
- if ($cflags =~ /-DOPENSSL_CAPIENG_DIALOG/)
- {
- $ex.=' cryptui.lib';
- }
}
}
elsif ($FLAVOR =~ /CE/)
}
}
elsif ($FLAVOR =~ /CE/)
@@
-292,7
+287,6
@@
sub do_lib_rule
$ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
$ex.=' crypt32.lib';
$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/;
$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
}
$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;