solenv/gbuild/extensions/pre_MergedLibsList.mk | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit c50e3f57d9098c7c7058c464e572cf7e70e3808d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 12 08:17:54 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 12 12:40:42 2020 +0100
add some more libs to libmerged
Change-Id: I14ec1c6015c8a71fabca90ca3dec52965915a63f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88511
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 03a64792d191..89c37ff9fc8d 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -10,20 +10,25 @@
# we link all object files from these libraries into one, merged library
MERGE_LIBRARY_LIST := \
avmedia \
+ $(if $(filter WNT,$(OS)),avmediawin) \
$(call gb_Helper_optional,SCRIPTING, \
basctl \
+ basprov \
) \
basegfx \
+ canvasfactory \
canvastools \
comphelper \
configmgr \
cppcanvas \
$(call gb_Helper_optional,BREAKPAD,crashreport) \
+ ctl \
dbtools \
deployment \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(USING_X11),desktop_detector) \
+ $(if $(filter WNT,$(OS)),directx9canvas) \
drawinglayer \
editeng \
filterconfig \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
