Fix use of config-specific libraries for Windows OpenSSL

Commit 614350a3 allowed for an different builds of OpenSSL libraries on
Windows, but ignored the fact that the alternative builds don't have
config-specific libraries. This patch fixes the Solution file to ask for
the correct libraries.

per offline discussions with Leonardo Cecchi and Marco Nenciarini,

Backpatch to all live branches.

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 696da2be92017547421ae3dc6cc4672e88cd1397..761e920576dd813821afae959c2c9d98a8adec2b 100644 (file)
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -537,10 +537,12 @@ sub AddProject
                }
                else
                {
+                       # We don't expect the config-specific library to be here,
+                       # so don't ask for it in last parameter
                        $proj->AddLibrary(
-                               $self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
+                               $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
                        $proj->AddLibrary(
-                               $self->{options}->{openssl} . '\lib\libeay32.lib', 1);
+                               $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
                }
        }
        if ($self->{options}->{nls})