diff options
| author | Andrew Dunstan | 2018-01-03 20:26:39 +0000 |
|---|---|---|
| committer | Andrew Dunstan | 2018-01-03 20:34:02 +0000 |
| commit | 2d03daa7b8b1b8061afa80bdec85da5d761e1023 (patch) | |
| tree | 923bd23b159c03747294a20274af0d71de65cfb2 /src | |
| parent | fe6bdc0a38c7bdb8d94f720f7a33cfee87458f6d (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Solution.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 353bcf50aa9..58f87bc1b4a 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -510,10 +510,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}) |