Kaydet (Commit) ce629d95 authored tarafından Michael Meeks's avatar Michael Meeks

Another attempt at fixing icu linkage as externals.

üst 867a7238
...@@ -38,24 +38,15 @@ $(eval $(call gb_Library_set_include,i18nsearch,\ ...@@ -38,24 +38,15 @@ $(eval $(call gb_Library_set_include,i18nsearch,\
$(eval $(call gb_Library_use_sdk_api,i18nsearch)) $(eval $(call gb_Library_use_sdk_api,i18nsearch))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Library_use_externals,i18nsearch,\ $(eval $(call gb_Library_use_externals,i18nsearch,\
icuin \ $(if $(filter MSC,$(COM)),icuin,icui18n) \
icuuc \
))
else
$(eval $(call gb_Library_use_externals,i18nsearch,\
icui18n \
icuuc \ icuuc \
)) ))
endif
$(eval $(call gb_Library_use_libraries,i18nsearch,\ $(eval $(call gb_Library_use_libraries,i18nsearch,\
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
icuuc \
$(if $(filter MSC,$(COM)),icuin,icui18n) \
sal \ sal \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
......
...@@ -685,6 +685,7 @@ bool IosSalGraphics::drawPolyLine( ...@@ -685,6 +685,7 @@ bool IosSalGraphics::drawPolyLine(
{ {
return false; return false;
} }
// setup line attributes // setup line attributes
CGLineJoin aCGLineJoin = kCGLineJoinMiter; CGLineJoin aCGLineJoin = kCGLineJoinMiter;
switch( eLineJoin ) switch( eLineJoin )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment