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.

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 0fcf24ac209cf8005adb5ef0aafbf5db46b6c70b..2060ab396696bda86c6d40a56d28533bc5c1bba9 100644 (file)
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -484,10 +484,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})
    {