diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-19 12:38:09 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-19 17:58:48 +0300 |
| commit | bdfca5e003eea0462cf15c3374afce01c2f46906 (patch) | |
| tree | a8ae93bc1d78a603a2c538a3b19e2505e0dfe7b6 | |
| parent | bd6fadb384bf1a2f542a077a44549a533e8fcb62 (diff) | |
The shorter icu library names are used for WNTMSC only
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | i18npool/Executable_gencoll_rule.mk | 2 | ||||
| -rw-r--r-- | i18npool/Library_i18npool.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ee693370fe1c..08c34dc8f3f8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -372,8 +372,8 @@ endef else # !SYSTEM_ICU -# icudata and icui18n is called icudt and icuin on Windows :-( -ifeq ($(OS),WNT) +# icudata and icui18n is called icudt and icuin when built with MSVC :-( +ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudt \ icuin \ diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index a899976515a0..e03d8b057a5f 100644 --- 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 \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 982e43ed93bc..ba5cae599458 100644 --- 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 \ |