From d5d079a00be569bc575fa71961af98cec99eccc0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 17 Feb 2020 09:17:55 +0200 Subject: add some libs to libmerged another small chunk of libs shared by calc/write/impress, doing this in stages in case anything goes wrong. Change-Id: I7bb47bf1dfa0cc12cbcb881da8405bdef41cb378 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88843 Tested-by: Jenkins Reviewed-by: Noel Grandin --- solenv/gbuild/extensions/pre_MergedLibsList.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'solenv') diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index c5494fde44b5..9cb91a5d4a15 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -55,24 +55,34 @@ MERGE_LIBRARY_LIST := \ $(if $(ENABLE_JAVA),javaloader) \ $(if $(ENABLE_JAVA),javavm) \ lng \ + lnth \ localebe1 \ mcnttype \ msfilter \ mtfrenderer \ + numbertext \ + odfflatxml \ + offacc \ + $(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ package2 \ + passwordcontainer \ sax \ sb \ simplecanvas \ sfx \ sofficeapp \ sot \ + spell \ $(if $(DISABLE_GUI),,spl) \ + srtrs1 \ $(call gb_Helper_optional,SCRIPTING,stringresource) \ + svgio \ svl \ svt \ svx \ svxcore \ + syssh \ tk \ tl \ ucb1 \ -- cgit