summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan2017-06-05 18:24:42 +0000
committerAndrew Dunstan2017-06-05 18:24:42 +0000
commit614350a3ab73992f48c86e26552a2cbf030180e2 (patch)
tree6737f85b9954347d40f683443d3b37426857e581
parentd4663350646ca0c069a36d906155a0f7e3372eb7 (diff)
Find openssl lib files in right directory for MSVC
Some openssl builds put their lib files in a VC subdirectory, others do not. Cater for both cases. Backpatch to all live branches. From an offline discussion with Leonardo Cecchi.
-rw-r--r--src/tools/msvc/Solution.pm18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 70cd23b888..d91e0a0da6 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -523,10 +523,20 @@ sub AddProject
if ($self->{options}->{openssl})
{
$proj->AddIncludeDir($self->{options}->{openssl} . '\include');
- $proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
- $proj->AddLibrary(
- $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
+ if (-e "$self->{options}->{openssl}/lib/VC/ssleayMD.lib")
+ {
+ $proj->AddLibrary(
+ $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
+ $proj->AddLibrary(
+ $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
+ }
+ else
+ {
+ $proj->AddLibrary(
+ $self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
+ $proj->AddLibrary(
+ $self->{options}->{openssl} . '\lib\libeay32.lib', 1);
+ }
}
if ($self->{options}->{nls})
{