summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-03-01 11:24:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-03-02 06:25:52 +0100
commit2083679b61623cfe1dbd71f486ff4f63f837db2d (patch)
treef501b192315c3c54297621bdf2ccd794144109f5 /solenv/gbuild
parentcde2bf606960b7bf0945b394a70e0e5c1a947ec0 (diff)
add ado to --enable-mergedlibs=more
Change-Id: I0d04eb2ab9b6384576194dc2c6421310da227b8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164215 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.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 91e40b381181..cad91095a4cc 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -119,6 +119,9 @@ ifneq ($(MERGELIBS_MORE),)
gb_MERGE_LIBRARY_LIST += \
acc \
+ $(if $(filter $(OS),WNT), \
+ ado \
+ ) \
analysis \
animcore \
$(call gb_Helper_optional,AVMEDIA, \