Fix use of config-specific libraries for Windows OpenSSL

adunstan · adunstan · commit 0fb69340b235 · 2018-01-03T15:33:12.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
@@ -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})

Original file line number	Diff line number	Diff line change
`@@ -537,10 +537,12 @@ sub AddProject`
`537`	`537`	`}`
`538`	`538`	`else`
`539`	`539`	`{`
	`540`	`+ # We don't expect the config-specific library to be here,`
	`541`	`+ # so don't ask for it in last parameter`
`540`	`542`	`$proj->AddLibrary(`
`541`		`- $self->{options}->{openssl} . '\lib\ssleay32.lib', 1);`
	`543`	`+ $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);`
`542`	`544`	`$proj->AddLibrary(`
`543`		`- $self->{options}->{openssl} . '\lib\libeay32.lib', 1);`
	`545`	`+ $self->{options}->{openssl} . '\lib\libeay32.lib', 0);`
`544`	`546`	`}`
`545`	`547`	`}`
`546`	`548`	`if ($self->{options}->{nls})`