solenv/gbuild/extensions/pre_MergedLibsList.mk | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 5b1a757993862042b673954735ecd4379b3f1c32
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 12 14:06:53 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 12 17:26:12 2020 +0100
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.gran...@collabora.co.uk>
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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
