Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 85cdcde

Browse files
committed
Fix use of config-specific libraries for Windows OpenSSL
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.
1 parent fe0cc5b commit 85cdcde

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/tools/msvc/Solution.pm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,10 +533,12 @@ sub AddProject
533533
}
534534
else
535535
{
536+
# We don't expect the config-specific library to be here,
537+
# so don't ask for it in last parameter
536538
$proj->AddLibrary(
537-
$self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
539+
$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
538540
$proj->AddLibrary(
539-
$self->{options}->{openssl} . '\lib\libeay32.lib', 1);
541+
$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
540542
}
541543
}
542544
if ($self->{options}->{nls})

0 commit comments

Comments
 (0)