diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2018-08-22 13:03:34 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2018-08-23 14:03:28 +0000 |
| commit | 4f6fa5b2ae839e01468f0e96b0f68d948811c31e (patch) | |
| tree | 11ab266c60a684c1fbc306ac90ba66e38c917398 | |
| parent | a88645c6f45188d93c6ca0a591aaeae2b3c4d5c4 (diff) | |
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>
| -rw-r--r-- | configure.json | 1 | ||||
| -rw-r--r-- | src/gui/configure.json | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 16a2af5bab..1f45f2ccb2 100644 --- a/configure.json +++ b/configure.json @@ -161,6 +161,7 @@ }, "sources": [ { "libs": "-lzdll", "condition": "config.msvc" }, + { "libs": "-lzlib", "condition": "config.msvc" }, { "libs": "-lz", "condition": "!config.msvc" } ] }, diff --git a/src/gui/configure.json b/src/gui/configure.json index 8e6569c069..26a5ae9a3d 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -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": [ |