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.grandin@collabora.co.uk>
This commit is contained in:
committed by
Noel Grandin
parent
ca1c8b4471
commit
29c9587df7
@@ -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) \
|
||||
|
||||
Reference in New Issue
Block a user