make IOS generic DISABLE_DYNLOADING and explicit link to icudata

Change-Id: I515fb2e772e63fef00711c87200512ea1bed024c
Reviewed-on: https://gerrit.libreoffice.org/32206
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2016-12-20 09:30:30 +00:00
parent 87114367d7
commit 0e0508b18f
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -22,6 +22,7 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\
$(eval $(call gb_Executable_use_externals,gencoll_rule,\
icui18n \
icuuc \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),icudata) \
icu_headers \
))
+1 -1
View File
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_externals,i18npool,\
icu_headers \
))
ifeq ($(OS),IOS)
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_Library_add_cxxflags,i18npool,\
-DDICT_JA_ZH_IN_DATAFILE \
))