summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-12 08:17:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-12 12:40:42 +0100
commitc50e3f57d9098c7c7058c464e572cf7e70e3808d (patch)
tree58cf8045c48478e8ea523188e57c7c0757a20147 /solenv/gbuild
parent7435040a18eb866be0fa77e71c6b4c626f1ae897 (diff)
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.grandin@collabora.co.uk>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk5
1 files changed, 5 insertions, 0 deletions
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 \