From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf --- src/gui/configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json index 219385a108..d629a45b92 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -291,7 +291,8 @@ "sources": [ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng", "condition": "config.msvc" }, - { "libs": "-lpng", "condition": "!config.msvc" } + { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" }, + { "libs": "-lpng", "condition": "!config.msvc && features.shared" } ], "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -- 2.18.0