From 531643d6b3f73cd23ccd6e8d1229874c306d3057 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/31] 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 3f07fba4d5..b000d00801 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -107,8 +107,11 @@ "label": "FreeType", "test": "unix/freetype", "sources": [ - { "type": "pkgConfig", "args": "freetype2" }, - { "type": "freetype", "libs": "-lfreetype" } + { "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" }, + { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared" }, + { "libs": "-lfreetype", "condition": "features.shared" } ] }, "fontconfig": { -- 2.13.2