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 70cd23b888b81f230acecd7e092f19449c5d3950..d91e0a0da6a8f271432e87e444d17de434ee4f0b 100644 (file)
--- 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})
        {