summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-12 14:06:53 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-12 17:26:12 +0100
commit5b1a757993862042b673954735ecd4379b3f1c32 (patch)
treefdcd3d9bf86eba7521fca72e928e8b0a52c9f25d /solenv/gbuild
parentc5d2c4cac83fb013052b490e212b79dc51605cd8 (diff)
add some more libs to libmerged
Change-Id: I2d3c3d64f1fb1d3635bdde761f6502ba05221f95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88522 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.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 89c37ff9fc8d..a654adc68b44 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -31,11 +31,20 @@ MERGE_LIBRARY_LIST := \
$(if $(filter WNT,$(OS)),directx9canvas) \
drawinglayer \
editeng \
+ emfio \
+ $(if $(filter WNT,$(OS)),emser) \
+ evtatt \
filterconfig \
+ for \
+ forui \
+ fps_office \
+ frm \
fsstorage \
fwe \
fwi \
fwk \
+ fwl \
+ $(if $(filter WNT,$(OS)),gdipluscanvas) \
$(call gb_Helper_optional,DESKTOP,helplinker) \
i18npool \
i18nutil \