summaryrefslogtreecommitdiff
path: root/solenv/gbuild/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-02-07 12:29:08 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-02-08 08:08:17 +0100
commitba3d3c308e944978a6b84b81cdcc1fd18f0c713e (patch)
tree28381db6b3ab290b934dd9feb9dc7fec5f6efcf0 /solenv/gbuild/extensions
parent6a831189367528d8d9eea0eb6826af401f756cc6 (diff)
add oox to --enable-mergelibs
Change-Id: Ic5158faa07538a688fe609cfd1359ec9ce3b6807 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163089 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'solenv/gbuild/extensions')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 44b9bbc47688..be37fe3752fc 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -61,6 +61,7 @@ gb_MERGE_LIBRARY_LIST := \
odfflatxml \
offacc \
$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
+ oox \
$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
package2 \
passwordcontainer \