Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit99d5a3f

Browse files
committed
Fix use of config-specific libraries for Windows OpenSSL
Commit614350a allowed for an different builds of OpenSSL libraries onWindows, but ignored the fact that the alternative builds don't haveconfig-specific libraries. This patch fixes the Solution file to ask forthe correct libraries.per offline discussions with Leonardo Cecchi and Marco Nenciarini,Backpatch to all live branches.
1 parent3c27944 commit99d5a3f

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
@@ -535,10 +535,12 @@ sub AddProject
535535
}
536536
else
537537
{
538+
# We don't expect the config-specific library to be here,
539+
# so don't ask for it in last parameter
538540
$proj->AddLibrary(
539-
$self->{options}->{openssl} .'\lib\ssleay32.lib',1);
541+
$self->{options}->{openssl} .'\lib\ssleay32.lib',0);
540542
$proj->AddLibrary(
541-
$self->{options}->{openssl} .'\lib\libeay32.lib',1);
543+
$self->{options}->{openssl} .'\lib\libeay32.lib',0);
542544
}
543545
}
544546
if ($self->{options}->{nls})

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp