PKGBUILDs/qt5-base/mingw-w64-angle/0007-Fix-linking-against-sh...

31 lines
1.3 KiB
Diff
Raw Normal View History

From 41f5e197d8624e713d48a5a800de3211ba7df7e5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
2019-06-14 19:09:09 +02:00
Subject: [PATCH 07/33] Fix linking against shared/static libpng
2017-06-02 18:20:04 +02:00
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
---
2018-12-08 22:06:32 +01:00
src/gui/configure.json | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
2019-06-14 19:09:09 +02:00
index 6280b4dfa2..36325920cd 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
2019-03-16 16:58:50 +01:00
@@ -387,8 +387,10 @@
{ "type": "pkgConfig", "args": "libpng" },
2018-12-08 22:06:32 +01:00
{ "libs": "-llibpng16", "condition": "config.msvc" },
{ "libs": "-llibpng", "condition": "config.msvc" },
2018-12-08 22:06:32 +01:00
- { "libs": "-lpng16", "condition": "!config.msvc" },
- { "libs": "-lpng", "condition": "!config.msvc" },
+ { "libs": "-lpng16 -lz", "condition": "!config.msvc && !features.shared" },
+ { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" },
2018-12-08 22:06:32 +01:00
+ { "libs": "-lpng16", "condition": "!config.msvc && features.shared" },
+ { "libs": "-lpng", "condition": "!config.msvc && features.shared" },
{ "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
2017-06-02 18:20:04 +02:00
],
"use": [
--
2.23.0