2018-12-30 23:49:46 +01:00
|
|
|
From 4907c25ba7070ad0f58b038f0d4b9de904b17961 Mon Sep 17 00:00:00 2001
|
2017-01-23 21:37:13 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Thu, 26 Jan 2017 17:51:31 +0100
|
2018-09-19 20:39:07 +02:00
|
|
|
Subject: [PATCH 08/33] Fix linking against shared/static libpng
|
2017-01-23 21:37:13 +01:00
|
|
|
|
2017-06-02 18:20:04 +02:00
|
|
|
Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
|
2017-01-23 21:37:13 +01:00
|
|
|
---
|
2018-12-08 22:06:32 +01:00
|
|
|
src/gui/configure.json | 6 ++++--
|
|
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
2017-01-23 21:37:13 +01:00
|
|
|
|
|
|
|
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
2018-12-08 22:06:32 +01:00
|
|
|
index 0332631ec8..dbb6f708b0 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/src/gui/configure.json
|
|
|
|
+++ b/src/gui/configure.json
|
2018-12-08 22:06:32 +01:00
|
|
|
@@ -308,8 +308,10 @@
|
2017-01-23 21:37:13 +01:00
|
|
|
{ "type": "pkgConfig", "args": "libpng" },
|
2018-12-08 22:06:32 +01:00
|
|
|
{ "libs": "-llibpng16", "condition": "config.msvc" },
|
2017-01-23 21:37:13 +01:00
|
|
|
{ "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" },
|
2017-01-23 21:37:13 +01:00
|
|
|
+ { "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": [
|
2017-01-23 21:37:13 +01:00
|
|
|
--
|
2018-12-22 00:04:30 +01:00
|
|
|
2.20.1
|
2017-01-23 21:37:13 +01:00
|
|
|
|