i18npool/Executable_gencoll_rule.mk | 1 + i18npool/Library_i18npool.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 0e0508b18f9daad618e19249daf008d518d5e860 Author: Caolán McNamara <[email protected]> Date: Mon Dec 19 21:36:25 2016 +0000 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 568619a..57c3cfd 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -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 \ )) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index f694be0..5da2cd4 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -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 \ ))
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
