solenv/gbuild/extensions/pre_MergedLibsList.mk | 9 ---------
1 file changed, 9 deletions(-)
New commits:
commit 29c9587df7f0e7ce27e616c6fc9640a1df0d20a7
Author: Noel Grandin <noelgran...@collabora.co.uk>
AuthorDate: Tue Feb 13 16:20:07 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Feb 13 18:13:46 2024 +0100
fix --enable-mergelibs=more build on Windows
I was over-enthusiastic adding these to the merged list, they
are DLLs with their own DllMain functions
Change-Id: I78a4e026e746f9688bc982ea7c899b05cf8f441d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163309
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 c2ec1e3b083b..9a2fffa033ac 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -138,15 +138,9 @@ gb_MERGE_LIBRARY_LIST += \
) \
graphicfilter \
hwp \
- $(if $(filter WNT,$(OS)), \
- inprocserv \
- ) \
log \
$(if $(ENABLE_LWP),lwpft) \
msforms \
- $(if $(filter WNT,$(OS)), \
- oleautobridge \
- ) \
pdffilter \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
@@ -159,9 +153,6 @@ gb_MERGE_LIBRARY_LIST += \
svgfilter \
t602filter \
textconversiondlgs \
- $(if $(filter WNT,$(OS)), \
- UAccCOM \
- ) \
$(call gb_Helper_optional,XMLHELP,ucpchelp1) \
$(if $(ENABLE_LIBCMIS),ucpcmis1) \
$(if $(WITH_WEBDAV),ucpdav1) \
