solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 0127eda727b612ffa7e6f811a95095bd03b8a37f Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Jul 14 11:31:05 2025 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Tue Jan 13 12:31:06 2026 +0100 Make avmediawin conditional on AVMEDIA Change-Id: I2cdec861d840d5987a70c26fd1b61ba1f39f0a30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194591 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197103 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index b16cc2ddcccc..2c4e2c68e2b7 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -10,7 +10,9 @@ # we link all object files from these libraries into one, merged library gb_MERGE_LIBRARY_LIST := \ avmedia \ - $(if $(filter WNT,$(OS)),avmediawin) \ + $(call gb_Helper_optional,AVMEDIA, \ + $(if $(filter WNT,$(OS)),avmediawin) \ + ) \ $(call gb_Helper_optional,SCRIPTING, \ basctl \ basprov \
