diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-09-22 19:45:23 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-10-18 20:41:31 +0200 |
| commit | b285eaf5f866b995861c61bd4bfedc9abca2676a (patch) | |
| tree | 19f9c73e02b13c9828442533f751f069f9a36595 /vcl | |
| parent | 610eceb035280ed5714b314051913d2412cde604 (diff) | |
Always build Graphite everywhere
It is no longer an optional feature on any platform. The
--enable-graphite stuff is kept as it controls the old Graphite
integration code and it should be removed without.
Change-Id: Ib4d76bba782a1439f02f93411b22d237a1987ea5
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/CppunitTest_vcl_wmf_test.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk index 51e912661033..1de86d83fff5 100644 --- a/vcl/CppunitTest_vcl_wmf_test.mk +++ b/vcl/CppunitTest_vcl_wmf_test.mk @@ -80,6 +80,7 @@ endif $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_test,\ gio \ + graphite \ harfbuzz \ icuuc \ lcms2 \ @@ -90,10 +91,6 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_test,\ )) endif -ifeq ($(ENABLE_GRAPHITE),TRUE) -$(eval $(call gb_CppunitTest_use_external,vcl_wmf_test,graphite)) -endif - ifeq ($(OS),MACOSX) $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,vcl_wmf_test,\ ApplicationServices \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 67bcbe580d50..2b0874a2334d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -116,6 +116,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ boost_headers \ gio \ glm_headers \ + graphite \ harfbuzz \ icu_headers \ icuuc \ @@ -434,8 +435,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ )) endif -$(eval $(call gb_Library_use_external,vcl,graphite)) - endif vcl_quartz_code= \ |