diff options
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/Executable_gencoll_rule.mk | 8 | ||||
| -rw-r--r-- | i18npool/Executable_genindex_data.mk | 8 | ||||
| -rw-r--r-- | i18npool/Library_i18npool.mk | 7 | ||||
| -rw-r--r-- | i18npool/source/collator/Makefile | 2 |
4 files changed, 24 insertions, 1 deletions
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 53eec591ce90..a899976515a0 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -41,11 +41,19 @@ $(eval $(call gb_Executable_add_linked_libs,gencoll_rule,\ $(gb_STDLIBS) \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_use_externals,gencoll_rule,\ + icudt \ + icuin \ + icuuc \ +)) +else $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudata \ icui18n \ icuuc \ )) +endif $(eval $(call gb_Executable_add_exception_objects,gencoll_rule,\ i18npool/source/collator/gencoll_rule \ diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 59772416617c..93f24831cbde 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -40,11 +40,19 @@ $(eval $(call gb_Executable_add_linked_libs,genindex_data,\ $(gb_STDLIBS) \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_use_externals,gencoll_rule,\ + icudt \ + icuin \ + icuuc \ +)) +else $(eval $(call gb_Executable_use_externals,genindex_data,\ icudata \ icui18n \ icuuc \ )) +endif $(eval $(call gb_Executable_add_exception_objects,genindex_data,\ i18npool/source/indexentry/genindex_data \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 5769cf9fa478..982e43ed93bc 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -56,10 +56,17 @@ $(eval $(call gb_Library_add_linked_libs,i18npool,\ $(gb_STDLIBS) \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_use_externals,i18npool,\ + icuin \ + icuuc \ +)) +else $(eval $(call gb_Library_use_externals,i18npool,\ icui18n \ icuuc \ )) +endif $(eval $(call gb_Library_add_exception_objects,i18npool,\ i18npool/source/breakiterator/breakiterator_cjk \ diff --git a/i18npool/source/collator/Makefile b/i18npool/source/collator/Makefile index 87740d265cdb..4d1ed240547d 100644 --- a/i18npool/source/collator/Makefile +++ b/i18npool/source/collator/Makefile @@ -26,7 +26,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -txtlist := $(wildcard $(SRC_ROOT)/i18npool/source/collator/data/*.txt) +txtlist := $(wildcard $(realpath $(SRC_ROOT)/i18npool/source/collator/data)/*.txt) all : lrl_include.hxx $(patsubst %.txt,collator_%.cxx,$(notdir $(txtlist))) |