diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 21:36:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 09:30:30 +0000 |
commit | 0e0508b18f9daad618e19249daf008d518d5e860 (patch) | |
tree | 92933a1e412180b58ca5f55a00ae927c0795d9a8 /i18npool | |
parent | some raptor tweaks for --disable-dynload (diff) | |
download | core-0e0508b18f9daad618e19249daf008d518d5e860.tar.gz core-0e0508b18f9daad618e19249daf008d518d5e860.zip |
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>
Diffstat (limited to 'i18npool')
-rw-r--r-- | i18npool/Executable_gencoll_rule.mk | 1 | ||||
-rw-r--r-- | i18npool/Library_i18npool.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 568619a6d37f..57c3cfd72b30 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 f694be0f588e..5da2cd447d2e 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 \ )) |