strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add oox to --enable-mergelibs

Browse source 
Change-Id: Ic5158faa07538a688fe609cfd1359ec9ce3b6807
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163089
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-02-07 12:29:08 +02:00
parent 6a83118936
commit ba3d3c308e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RepositoryModule_host.mk
View file

@ -231,9 +231,9 @@ $(eval $(call repositorymodule_serialize,\
$(call gb_Helper_optional,DESKTOP,swui) \ $(call gb_Helper_optional,DESKTOP,swui) \
sw sd \ sw sd \
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
writerfilter cui chartcontroller chartcore oox \ writerfilter cui chartcontroller chartcore \
$(if $(MERGELIBS), merged, \ $(if $(MERGELIBS), merged, \
svx svxcore xo sfx fwk svt vcl) \ oox svx svxcore xo sfx fwk svt vcl) \
)) ))
endif endif
endif # !$(DISABLE_DYNLOADING) endif # !$(DISABLE_DYNLOADING)

1
solenv/gbuild/extensions/pre_MergedLibsList.mk
View file

@ -61,6 +61,7 @@ gb_MERGE_LIBRARY_LIST := \
odfflatxml \ odfflatxml \
offacc \ offacc \
$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \ $(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
oox \
$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
package2 \ package2 \
passwordcontainer \ passwordcontainer \