Skip to content
Snippets Groups Projects
Commit 5404145c authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files

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 9173695b
No related branches found
Tags
No related merge requests found
......@@ -513,10 +513,12 @@ sub AddProject
}
else
{
# We don't expect the config-specific library to be here,
# so don't ask for it in last parameter
$proj->AddLibrary(
$self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
$proj->AddLibrary(
$self->{options}->{openssl} . '\lib\libeay32.lib', 1);
$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
}
}
if ($self->{options}->{nls})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment