NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit614350a

committed

Find openssl lib files in right directory for MSVC

Some openssl builds put their lib files in a VC subdirectory, others donot. Cater for both cases.Backpatch to all live branches.From an offline discussion with Leonardo Cecchi.

1 parentd466335 commit614350aCopy full SHA for 614350a

File tree

1 file changed

+14

-4

lines changed

src/tools/msvc
- Solution.pm

1 file changed

+14

-4

lines changed

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

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -523,10 +523,20 @@ sub AddProject`
`523`	`523`	`if ($self->{options}->{openssl})`
`524`	`524`	`{`
`525`	`525`	`$proj->AddIncludeDir($self->{options}->{openssl} .'\include');`
`526`		`-$proj->AddLibrary(`
`527`		`-$self->{options}->{openssl} .'\lib\VC\ssleay32.lib', 1);`
`528`		`-$proj->AddLibrary(`
`529`		`-$self->{options}->{openssl} .'\lib\VC\libeay32.lib', 1);`
	`526`	`+if (-e"$self->{options}->{openssl}/lib/VC/ssleayMD.lib")`
	`527`	`+{`
	`528`	`+$proj->AddLibrary(`
	`529`	`+$self->{options}->{openssl} .'\lib\VC\ssleay32.lib', 1);`
	`530`	`+$proj->AddLibrary(`
	`531`	`+$self->{options}->{openssl} .'\lib\VC\libeay32.lib', 1);`
	`532`	`+}`
	`533`	`+else`
	`534`	`+{`
	`535`	`+$proj->AddLibrary(`
	`536`	`+$self->{options}->{openssl} .'\lib\ssleay32.lib', 1);`
	`537`	`+$proj->AddLibrary(`
	`538`	`+$self->{options}->{openssl} .'\lib\libeay32.lib', 1);`
	`539`	`+}`
`530`	`540`	`}`
`531`	`541`	`if ($self->{options}->{nls})`
`532`	`542`	`{`

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!

Commit614350a

File tree

1 file changed

1 file changed

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

0 commit comments