Commit 614350a3 authored by Andrew Dunstan's avatar Andrew Dunstan

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.
parent d4663350
...@@ -523,10 +523,20 @@ sub AddProject ...@@ -523,10 +523,20 @@ sub AddProject
if ($self->{options}->{openssl}) if ($self->{options}->{openssl})
{ {
$proj->AddIncludeDir($self->{options}->{openssl} . '\include'); $proj->AddIncludeDir($self->{options}->{openssl} . '\include');
$proj->AddLibrary( if (-e "$self->{options}->{openssl}/lib/VC/ssleayMD.lib")
$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); {
$proj->AddLibrary( $proj->AddLibrary(
$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); $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}) if ($self->{options}->{nls})
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment