From 4f6fa5b2ae839e01468f0e96b0f68d948811c31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 22 Aug 2018 13:03:34 +0200 Subject: 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 --- src/gui/configure.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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": [ -- cgit v1.2.3