Skip to content

Commit

Permalink
configure: adjust openssl lib names on mingw
Browse files Browse the repository at this point in the history
both the mingw and msvc build have a "lib" prefix on the libraries. this
makes the msvc build unconventional, so it needs an extra source. for
the mingw build, otoh, this is the expected setup, so the source used
for unix will work just fine.

this doesn't fix any actual bug, because mingw will apparently resolve
-llibfoo to libfoo.a even though only liblibfoo.a and libfoo.lib are
documented (on mingw.org). however, this mix of conventions is ugly and
should be avoided.

Change-Id: I32b1621e4ac15db1f071c08ced738bfdafdcc11b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
  • Loading branch information
ossilator committed Dec 17, 2018
1 parent 5485a08 commit c07ab93
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/network/configure.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,12 @@
},
{
"libs": "-llibssl -llibcrypto",
"condition": "config.win32"
"condition": "config.msvc"
},
{ "libs": "-lssl -lcrypto", "condition": "!config.win32" }
{
"libs": "-lssl -lcrypto",
"condition": "!config.msvc"
}
]
}
},
Expand Down

0 comments on commit c07ab93

Please sign in to comment.