summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-11-12 15:17:07 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-11-12 15:47:02 +0000
commitce629d95a6eadea43a3b5b4208f3965767f9fcea (patch)
tree2b8b67820f2804e240fcf407f5041121ce74ab28 /i18npool
parent867a7238157fb6c96b5257a096db2421773e44ba (diff)
Another attempt at fixing icu linkage as externals.
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/Library_i18nsearch.mk11
1 files changed, 1 insertions, 10 deletions
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index b74eff81bbe1..d59345e91574 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -38,24 +38,15 @@ $(eval $(call gb_Library_set_include,i18nsearch,\
$(eval $(call gb_Library_use_sdk_api,i18nsearch))
-ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Library_use_externals,i18nsearch,\
- icuin \
- icuuc \
-))
-else
-$(eval $(call gb_Library_use_externals,i18nsearch,\
- icui18n \
+ $(if $(filter MSC,$(COM)),icuin,icui18n) \
icuuc \
))
-endif
$(eval $(call gb_Library_use_libraries,i18nsearch,\
comphelper \
cppu \
cppuhelper \
- icuuc \
- $(if $(filter MSC,$(COM)),icuin,icui18n) \
sal \
$(gb_UWINAPI) \
))