Library_merged.mk | 10 ++++++++-- android/qa/sc/Makefile | 3 +++ sfx2/source/appl/appbas.cxx | 17 +++++++++++++++++ solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 ++++++ solenv/gbuild/platform/com_GCC_defs.mk | 5 +++++ 5 files changed, 39 insertions(+), 2 deletions(-)
New commits: commit 71fb61b77a548ac8b0b499f7c6039e197c994842 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Feb 13 15:55:46 2012 +0200 Need libfastsax.uno diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index a55083c..a57ecab 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -61,6 +61,7 @@ copy-stuff: configmgr.uno \ datelo \ expwrap.uno \ + fastsax.uno \ fileacc \ fontconfig \ forlo \ commit 49675b89cc08cb065fe4dc7bd53dd9422ae4e8d4 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Feb 13 13:57:42 2012 +0200 Need libdatelo diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index aa8f59f..a55083c 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -59,6 +59,7 @@ copy-stuff: bootstrap.uno \ comphelpgcc3 \ configmgr.uno \ + datelo \ expwrap.uno \ fileacc \ fontconfig \ commit 2b455134b0bc9b2632f095503b87ec90158b24b5 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Feb 9 15:22:30 2012 +0200 Need also libintrospection.uno diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 997bcf7..aa8f59f 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -77,6 +77,7 @@ copy-stuff: icui18nlo \ iculelo \ icuuclo \ + introspection.uno \ jvmaccessgcc3 \ jvmfwk \ localedata_en \ commit 7edb4c739332432b11b5d31df9dc7bba3761f4f1 Author: Tor Lillqvist <t...@iki.fi> Date: Thu Feb 9 22:31:30 2012 +0200 Add fw* and sfx to libmerged diff --git a/Library_merged.mk b/Library_merged.mk index b2e49b0..ac55cdc 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -28,14 +28,12 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ comphelper \ cppu \ cppuhelper \ - fwe \ i18nisolang1 \ i18npaper \ sal \ salhelper \ sax \ sb \ - sfx \ sot \ svl \ svt \ @@ -50,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ $(eval $(call gb_Library_use_externals,merged,\ icuuc \ + libxml2 \ zlib \ )) @@ -76,4 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ )) endif +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_linked_libs,merged,\ + objc \ + Cocoa \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 1f28ec8..8516a90 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -86,10 +86,27 @@ #include <svl/srchitem.hxx> #include <osl/socket.hxx> +#ifdef LIBO_MERGELIBS +/* Avoid clash with the ones from svx/source/form/typemap.cxx */ +#define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl +#define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl +#define aSfxUInt16Item_Impl sfx2_source_appl_appbas_aSfxUInt16Item_Impl +#define aSfxUInt32Item_Impl sfx2_source_appl_appbas_aSfxUInt32Item_Impl +#define aSfxVoidItem_Impl sfx2_source_appl_appbas_aSfxVoidtem_Impl +#endif + #define SFX_TYPEMAP #define Selection #include "sfxslots.hxx" +#ifdef LIBO_MERGELIBS +#undef aSfxBoolItem_Impl +#undef aSfxStringItem_Impl +#undef aSfxUInt16Item_Impl +#undef aSfxUInt32Item_Impl +#undef aSfxVoidItem_Impl +#endif + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index e39e6f4..ebd70a3 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -36,8 +36,14 @@ gb_MERGEDLIBS := \ drawinglayer \ editeng \ filterconfig \ + fwe \ + fwi \ + fwk \ + fwl \ + fwm \ lng \ package2 \ + sfx \ sofficeapp \ spl \ svx \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index f2bf866..80ed26c 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -107,6 +107,11 @@ gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR endif +ifeq ($(MERGELIBS),TRUE) +gb_CFLAGS_COMMON += -DLIBO_MERGELIBS +gb_CXXFLAGS_COMMON += -DLIBO_MERGELIBS +endif + ifeq ($(ENABLE_LTO),TRUE) gb_Library_LTOFLAGS := -flto endif _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits