Kaydet (Commit) 84deb155 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

tdf#120099 Reintroduce .def files

...that had been removed with 28b4f4ae "Get rid
of Windows .def files in setup_native, use __declspec(dllexport)".  Looks like
for 32-bit builds, the .def file EXPORTS are still needed to avoid __stdcall's
_...@NN symbol decoration (and for 64-bit builds __stdcall is effectively
ignored, so the removed .def files didn't make a difference there).

This is only a partial revert of 28b4f4ae, the
addition of __declspec(dllexport) for the benefit of loplguin:external should
still be fine.

Change-Id: I76a1a3f4671824367bab495afeba291c0340108d
Reviewed-on: https://gerrit.libreoffice.org/61047
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst b430722d
......@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,inst_msu_msi,\
))
$(eval $(call gb_Library_add_ldflags,inst_msu_msi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def \
/NODEFAULTLIB \
))
......
......@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,instooofiltmsi,\
))
$(eval $(call gb_Library_add_ldflags,instooofiltmsi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def \
/NODEFAULTLIB \
))
......
......@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,qslnkmsi,\
))
$(eval $(call gb_Library_add_ldflags,qslnkmsi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def \
/NODEFAULTLIB \
))
......
......@@ -20,6 +20,7 @@ $(eval $(call gb_Library_add_cxxflags,reg4allmsdoc,\
))
$(eval $(call gb_Library_add_ldflags,reg4allmsdoc,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def \
/NODEFAULTLIB \
))
......
......@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,regactivex,\
))
$(eval $(call gb_Library_add_ldflags,regactivex,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/regactivex/regactivex.def \
/NODEFAULTLIB \
))
......
......@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,sdqsmsi,\
))
$(eval $(call gb_Library_add_ldflags,sdqsmsi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def \
/NODEFAULTLIB \
))
......
......@@ -22,6 +22,7 @@ $(eval $(call gb_Library_add_cxxflags,sellangmsi,\
))
$(eval $(call gb_Library_add_ldflags,sellangmsi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/sellang/sellang.def \
/NODEFAULTLIB \
))
......
......@@ -22,6 +22,7 @@ $(eval $(call gb_Library_add_cxxflags,shlxtmsi,\
))
$(eval $(call gb_Library_add_ldflags,shlxtmsi,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def \
/NODEFAULTLIB \
))
......
......@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,sn_tools,\
))
$(eval $(call gb_Library_add_ldflags,sn_tools,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/tools/sn_tools.def \
/NODEFAULTLIB \
))
......
LIBRARY "instooofiltmsi.dll"
EXPORTS
RestartIndexingService
\ No newline at end of file
LIBRARY "inst_msu_msi.dll"
EXPORTS
UnpackMSUForInstall
InstallMSU
CleanupMSU
\ No newline at end of file
LIBRARY "qslnkmsi.dll"
EXPORTS
RemoveQuickstarterLink
\ No newline at end of file
LIBRARY "sdqsmsi.dll"
EXPORTS
ShutDownQuickstarter
\ No newline at end of file
LIBRARY "reg4allmsdoc.dll"
EXPORTS
FindRegisteredExtensions
LookForRegisteredExtensions
RegisterSomeExtensions
RestoreRegAllMSDoc
\ No newline at end of file
LIBRARY "regactivex.dll"
EXPORTS
InstallActiveXControl
DeinstallActiveXControl
\ No newline at end of file
LIBRARY "sellangmsi.dll"
EXPORTS
SelectLanguage
SortTree
\ No newline at end of file
LIBRARY "shlxtmsi.dll"
EXPORTS
CheckInstallDirectory
CheckPatchList
CompleteInstallPath
MigrateInstallPath
InstallStartmenuFolderIcon
DeinstallStartmenuFolderIcon
SetProductInstallMode
RenamePrgFolder
RemovePrgFolder
LIBRARY "sn_tools.dll"
EXPORTS
CheckVersions
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment