configure: add sources matching names from vcpkg

It's possible to use vcpkg using the -I and -L arguments, but
some of their libraries have different names than what we look for
during configure, so add in those variations.

Change-Id: Iee37197228cc0f15442ecd7ec4fc761f4d526e1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
bb10
Mårten Nordheim 2018-08-22 13:03:34 +02:00
parent a88645c6f4
commit 4f6fa5b2ae
2 changed files with 4 additions and 1 deletions

View File

@ -161,6 +161,7 @@
},
"sources": [
{ "libs": "-lzdll", "condition": "config.msvc" },
{ "libs": "-lzlib", "condition": "config.msvc" },
{ "libs": "-lz", "condition": "!config.msvc" }
]
},

View File

@ -294,7 +294,7 @@
},
"sources": [
{ "libs": "-llibjpeg", "condition": "config.msvc" },
{ "libs": "-ljpeg", "condition": "!config.msvc" }
"-ljpeg"
]
},
"libpng": {
@ -305,7 +305,9 @@
},
"sources": [
{ "type": "pkgConfig", "args": "libpng" },
{ "libs": "-llibpng16", "condition": "config.msvc" },
{ "libs": "-llibpng", "condition": "config.msvc" },
{ "libs": "-lpng16", "condition": "!config.msvc" },
{ "libs": "-lpng", "condition": "!config.msvc" }
],
"use": [