solenv/gbuild/extensions/pre_MergedLibsList.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2083679b61623cfe1dbd71f486ff4f63f837db2d
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Mar 1 11:24:49 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Mar 2 06:25:52 2024 +0100

    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.gran...@collabora.co.uk>

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, \

Reply via email to