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.
pull/25/head
Andrew Dunstan 8 years ago
parent 3c27944fb2
commit 99d5a3ffb9
  1. 6
      src/tools/msvc/Solution.pm

@ -535,10 +535,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})

Loading…
Cancel
Save