diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2018-01-03 15:26:39 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2018-01-03 15:33:32 -0500 |
| commit | 85cdcde1f42e136efce3c51bfd47bdf8ecb7d3dd (patch) | |
| tree | 2d78846fca28001f2d0257a5081b9dd743872a47 | |
| parent | fe0cc5ba5372eca5e9eec1b317dffa0adf7b1049 (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.
| -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 7ae6d371e9c..9ba3acf4f77 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -533,10 +533,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}) |