From a8adb53041a621c15dc8afc05caae8e74fe584b9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/33] Fix linking against static freetype2 Change-Id: I6e4a2baa25beb5f63b46f25153bd7bac52a2262f --- 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 e0043542ec..2fe0a018b1 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,10 @@ }, "headers": "ft2build.h", "sources": [ - { "type": "pkgConfig", "args": "freetype2" }, - { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, + { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" }, + { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec-static -lbrotlicommon-static -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.36.0