Fix use of config-specific libraries for Windows OpenSSL

adunstan · adunstan · commit 2d03daa7b8b1 · 2018-01-03T15:34:02.000-05:00
Commit 614350a 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
@@ -510,10 +510,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})

Original file line number	Diff line number	Diff line change
`@@ -510,10 +510,12 @@ sub AddProject`
`510`	`510`	`}`
`511`	`511`	`else`
`512`	`512`	`{`
	`513`	`+ # We don't expect the config-specific library to be here,`
	`514`	`+ # so don't ask for it in last parameter`
`513`	`515`	`$proj->AddLibrary(`
`514`		`- $self->{options}->{openssl} . '\lib\ssleay32.lib', 1);`
	`516`	`+ $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);`
`515`	`517`	`$proj->AddLibrary(`
`516`		`- $self->{options}->{openssl} . '\lib\libeay32.lib', 1);`
	`518`	`+ $self->{options}->{openssl} . '\lib\libeay32.lib', 0);`
`517`	`519`	`}`
`518`	`520`	`}`
`519`	`521`	`if ($self->{options}->{nls})`