Fix use of config-specific libraries for Windows OpenSSL

adunstan · adunstan · commit d329d2d3e496 · 2018-01-03T15:33:47.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
@@ -506,10 +506,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
`@@ -506,10 +506,12 @@ sub AddProject`
`506`	`506`	`}`
`507`	`507`	`else`
`508`	`508`	`{`
	`509`	`+ # We don't expect the config-specific library to be here,`
	`510`	`+ # so don't ask for it in last parameter`
`509`	`511`	`$proj->AddLibrary(`
`510`		`- $self->{options}->{openssl} . '\lib\ssleay32.lib', 1);`
	`512`	`+ $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);`
`511`	`513`	`$proj->AddLibrary(`
`512`		`- $self->{options}->{openssl} . '\lib\libeay32.lib', 1);`
	`514`	`+ $self->{options}->{openssl} . '\lib\libeay32.lib', 0);`
`513`	`515`	`}`
`514`	`516`	`}`
`515`	`517`	`if ($self->{options}->{nls})`