diff options
Diffstat (limited to '0007-Fix-linking-against-shared-static-libpng.patch')
| -rw-r--r-- | 0007-Fix-linking-against-shared-static-libpng.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch new file mode 100644 index 000000000000..f6892d8cc2da --- /dev/null +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -0,0 +1,30 @@ +From 6b429798b0e3eddc7e5c857cc3e5b9d7f70aa998 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Thu, 26 Jan 2017 17:51:31 +0100 +Subject: [PATCH 07/33] Fix linking against shared/static libpng + +Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf +--- + src/gui/configure.json | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 6280b4dfa2..36325920cd 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -387,8 +387,10 @@ + { "type": "pkgConfig", "args": "libpng" }, + { "libs": "-llibpng16", "condition": "config.msvc" }, + { "libs": "-llibpng", "condition": "config.msvc" }, +- { "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" }, ++ { "libs": "-lpng16", "condition": "!config.msvc && features.shared" }, ++ { "libs": "-lpng", "condition": "!config.msvc && features.shared" }, + { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" } + ], + "use": [ +-- +2.22.0 + |