diff options
| -rw-r--r-- | Library_merged.mk | 10 | ||||
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 17 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 5 |
5 files changed, 41 insertions, 2 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 742a6fb1ea01..6d2d90806828 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 \ )) @@ -77,4 +76,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 c16338bee821..5e7ac142a892 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -85,10 +85,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 e39e6f428cb0..ebd70a3462be 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/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index c10684590991..d542017b4092 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -191,6 +191,11 @@ gb_CFLAGS_WERROR := -WX -DLIBO_WERROR gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR endif +ifeq ($(MERGELIBS),TRUE) +gb_CFLAGS += -DLIBO_MERGELIBS +gb_CXXFLAGS += -DLIBO_MERGELIBS +endif + gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ -EHa \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index f2bf866e7046..80ed26c8ebdf 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 |