Skip to content
Snippets Groups Projects
Commit 614350a3 authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files

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
No related branches found
Tags
No related merge requests found
...@@ -523,11 +523,21 @@ sub AddProject ...@@ -523,11 +523,21 @@ sub AddProject
if ($self->{options}->{openssl}) if ($self->{options}->{openssl})
{ {
$proj->AddIncludeDir($self->{options}->{openssl} . '\include'); $proj->AddIncludeDir($self->{options}->{openssl} . '\include');
if (-e "$self->{options}->{openssl}/lib/VC/ssleayMD.lib")
{
$proj->AddLibrary( $proj->AddLibrary(
$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); $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\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})
{ {
$proj->AddIncludeDir($self->{options}->{nls} . '\include'); $proj->AddIncludeDir($self->{options}->{nls} . '\include');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment