Kaydet (Commit) 0e0508b1 authored tarafından Caolán McNamara's avatar Caolán McNamara

make IOS generic DISABLE_DYNLOADING and explicit link to icudata

Change-Id: I515fb2e772e63fef00711c87200512ea1bed024c
Reviewed-on: https://gerrit.libreoffice.org/32206Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 87114367
...@@ -22,6 +22,7 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ ...@@ -22,6 +22,7 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\
$(eval $(call gb_Executable_use_externals,gencoll_rule,\ $(eval $(call gb_Executable_use_externals,gencoll_rule,\
icui18n \ icui18n \
icuuc \ icuuc \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),icudata) \
icu_headers \ icu_headers \
)) ))
......
...@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_externals,i18npool,\ ...@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_externals,i18npool,\
icu_headers \ icu_headers \
)) ))
ifeq ($(OS),IOS) ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_Library_add_cxxflags,i18npool,\ $(eval $(call gb_Library_add_cxxflags,i18npool,\
-DDICT_JA_ZH_IN_DATAFILE \ -DDICT_JA_ZH_IN_DATAFILE \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment