NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit85cdcde

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 parentfe0cc5b commit85cdcdeCopy full SHA for 85cdcde

File tree

1 file changed

-2

lines changed

src/tools/msvc
- Solution.pm

1 file changed

-2

lines changed

`‎src/tools/msvc/Solution.pm`

Lines changed: 4 additions & 2 deletions

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

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit85cdcde

File tree

1 file changed

1 file changed

`‎src/tools/msvc/Solution.pm`

0 commit comments