The shorter icu library names are used for WNTMSC only

bdfca5e0 · Tor Lillqvist · bd6fadb3 · bdfca5e0 · bdfca5e0 · bdfca5e0
Kaydet (Commit) bdfca5e0 authored Agu 19, 2011 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

RepositoryExternal.mk RepositoryExternal.mk +2 -2

Executable_gencoll_rule.mk i18npool/Executable_gencoll_rule.mk +1 -1

Library_i18npool.mk i18npool/Library_i18npool.mk +1 -1

No files found.
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -372,8 +372,8 @@ endef
 else # !SYSTEM_ICU
-# icudata and icui18n is called icudt and icuin on Windows :-(
+# icudata and icui18n is called icudt and icuin when built with MSVC :-(
-ifeq ($(OS),WNT)
+ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	icudt \
 	icuin \

--- a/i18npool/Executable_gencoll_rule.mk
+++ b/i18npool/Executable_gencoll_rule.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Executable_add_linked_libs,gencoll_rule,\
 	$(gb_STDLIBS) \
 ))
-ifeq ($(OS),WNT)
+ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Executable_use_externals,gencoll_rule,\
 	icudt \
 	icuin \

--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,i18npool,\
 	$(gb_STDLIBS) \
 ))
-ifeq ($(OS),WNT)
+ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Library_use_externals,i18npool,\
 	icuin \
 	icuuc \