diff options
| -rw-r--r-- | Library_merged.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 3684bd8d6d14..1e190b6fd14c 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -75,15 +75,13 @@ ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_externals,merged,\ hunspell \ expat_utf8 \ + mythes \ + hyphen \ )) $(eval $(call gb_Library_use_static_libraries,merged,\ sax_shared \ ulingu \ )) -$(eval $(call gb_Library_add_libs,merged,\ - $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \ - $(if $(filter MSC,$(COM)),hyphen.lib,-lhyphen) \ -)) endif ifeq ($(ENABLE_GRAPHITE),TRUE) @@ -183,12 +181,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ )) endif -ifneq ($(ENABLE_LIBRSVG),NO) -$(eval $(call gb_Library_use_externals,merged,\ - cairo \ -)) -endif - ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Library_use_externals,merged,\ gtk \ |