2017-06-30 22:27:38 +02:00
|
|
|
From 3b6fa1aeceb994d9d845f6de533c6c1517e56ab8 Mon Sep 17 00:00:00 2001
|
2017-01-23 21:37:13 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Sun, 18 Sep 2016 14:22:56 +0200
|
2017-06-02 18:20:04 +02:00
|
|
|
Subject: [PATCH 12/31] Fix linking against static harfbuzz
|
2017-01-23 21:37:13 +01:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
src/gui/configure.json | 6 +++++-
|
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
2017-06-30 22:27:38 +02:00
|
|
|
index b000d00801..5ba7fa26ae 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/src/gui/configure.json
|
|
|
|
|
+++ b/src/gui/configure.json
|
2017-06-30 22:27:38 +02:00
|
|
|
@@ -133,7 +133,11 @@
|
2017-01-23 21:37:13 +01:00
|
|
|
"label": "HarfBuzz",
|
|
|
|
|
"test": "unix/harfbuzz",
|
|
|
|
|
"sources": [
|
|
|
|
|
- "-lharfbuzz"
|
|
|
|
|
+ { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" },
|
|
|
|
|
+ { "type": "pkgConfig", "args": "--libs harfbuzz", "condition": "features.shared" },
|
|
|
|
|
+ { "libs": "-lharfbuzz -lfreetype -lharfbuzz -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
|
|
|
|
|
+ { "libs": "-Wl,-Bdynamic -lharfbuzz -Wl,-Bstatic", "condition": "!features.shared" },
|
|
|
|
|
+ { "libs": "-lharfbuzz", "condition": "features.shared" }
|
|
|
|
|
]
|
|
|
|
|
},
|
|
|
|
|
"imf": {
|
|
|
|
|
--
|
2017-06-30 22:27:38 +02:00
|
|
|
2.13.2
|
2017-01-23 21:37:13 +01:00
|
|
|
|
