android/qa/sc/Makefile | 2 +- sal/Library_sal.mk | 17 +++++++++++++++++ sal/Module_sal.mk | 3 ++- sal/textenc/textenc.cxx | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-)
New commits: commit 6de864ee19f8e1465d43fc6325403f6bdcaa3bc9 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Feb 13 21:35:57 2012 +0200 Need libtextinstream.uno diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 22318f0..0a6a5e8 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -100,6 +100,7 @@ copy-stuff: store \ svllo \ svtlo \ + textinstream.uno \ test \ tklo \ tllo \ commit 4866737a489d66fc2dc2153641390b609e1d5905 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Feb 13 21:34:13 2012 +0200 Don't bother with a separate libsal_textenc when merging libs diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 6899483..22318f0 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -91,7 +91,6 @@ copy-stuff: ooxlo \ reflection.uno \ reg \ - sal_textenc \ saxlo \ sclo \ scfiltlo \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index cbdbc82..13a514f 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -132,6 +132,23 @@ $(eval $(call gb_Library_add_cobjects,sal,\ sal/osl/all/filepath \ )) +ifeq ($(MERGELIBS),TRUE) +$(eval $(call gb_Library_add_exception_objects,sal,\ + sal/textenc/context \ + sal/textenc/convertbig5hkscs \ + sal/textenc/converteuctw \ + sal/textenc/convertgb18030 \ + sal/textenc/convertiso2022cn \ + sal/textenc/convertiso2022jp \ + sal/textenc/convertiso2022kr \ + sal/textenc/convertsinglebytetobmpunicode \ + sal/textenc/tables \ + sal/textenc/tcvtbyte \ + sal/textenc/tcvtmb \ + sal/textenc/tcvtutf7 \ +)) +endif + ifeq ($(GUI),UNX) $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/conditn \ diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 1260afd..c29ceac 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_targets,sal,\ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ - Library_sal_textenc \ + $(if $(filter TRUE,$(MERGELIBS)),, \ + Library_sal_textenc) \ $(if $(filter $(OS),WNT), \ Library_uwinapi) \ Package_inc \ diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 8d34920..b668492 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData namespace { -#if defined IOS +#if defined IOS || defined LIBO_MERGELIBS extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData( rtl_TextEncoding); // from tables.cxx in sal_textenc library _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits