summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-13 08:24:10 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-14 08:08:17 +0100
commit424a7f404565e068995e2a9827d5bc6f76920ec8 (patch)
tree1cae229608c484d6534c68c06a403aa91b8f0937 /solenv/gbuild
parentf7323482ae38c5c4bc39edeea4d1a6e282f896a2 (diff)
add some more libs to libmerged
Change-Id: I9e1677c26cf082ed78765995bfa7f57ff50f8e7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88580 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.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index a654adc68b44..c5494fde44b5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -45,9 +45,15 @@ MERGE_LIBRARY_LIST := \
fwk \
fwl \
$(if $(filter WNT,$(OS)),gdipluscanvas) \
+ guesslang \
$(call gb_Helper_optional,DESKTOP,helplinker) \
+ hyphen \
+ i18nsearch \
i18npool \
i18nutil \
+ io \
+ $(if $(ENABLE_JAVA),javaloader) \
+ $(if $(ENABLE_JAVA),javavm) \
lng \
localebe1 \
mcnttype \