31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
From 4bc1016e6268e57a5b8c9c3ae067166e41d10420 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Fri, 3 Feb 2017 20:51:19 +0100
|
|
Subject: [PATCH 10/33] Fix linking against static freetype2
|
|
|
|
---
|
|
src/gui/configure.json | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
|
index 36325920cd..972f9914ea 100644
|
|
--- a/src/gui/configure.json
|
|
+++ b/src/gui/configure.json
|
|
@@ -238,8 +238,11 @@
|
|
},
|
|
"headers": "ft2build.h",
|
|
"sources": [
|
|
- { "type": "pkgConfig", "args": "freetype2" },
|
|
- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
|
|
+ { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
|
|
+ { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
|
|
+ { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
|
|
+ { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
|
|
+ { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
|
|
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
|
|
{ "libs": "-lfreetype" }
|
|
],
|
|
--
|
|
2.23.0
|
|
|