Commit 99d5a3ff authored by Andrew Dunstan's avatar Andrew Dunstan

Fix use of config-specific libraries for Windows OpenSSL

Commit 614350a3 allowed for an different builds of OpenSSL libraries on
Windows, but ignored the fact that the alternative builds don't have
config-specific libraries. This patch fixes the Solution file to ask for
the correct libraries.

per offline discussions with Leonardo Cecchi and Marco Nenciarini,

Backpatch to all live branches.
parent 3c27944f
...@@ -535,10 +535,12 @@ sub AddProject ...@@ -535,10 +535,12 @@ sub AddProject
} }
else else
{ {
# We don't expect the config-specific library to be here,
# so don't ask for it in last parameter
$proj->AddLibrary( $proj->AddLibrary(
$self->{options}->{openssl} . '\lib\ssleay32.lib', 1); $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
$proj->AddLibrary( $proj->AddLibrary(
$self->{options}->{openssl} . '\lib\libeay32.lib', 1); $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
} }
} }
if ($self->{options}->{nls}) if ($self->{options}->{nls})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment