From 84deb15526fa9501eb57eec53e21bd6e2d7f7ce5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Sep 2018 17:34:30 +0200 Subject: tdf#120099 Reintroduce .def files ...that had been removed with 28b4f4aeaf160c7721dfecf5bd2445d7dbc6f01c "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 28b4f4aeaf160c7721dfecf5bd2445d7dbc6f01c, 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: Stephan Bergmann --- setup_native/Library_sdqsmsi.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'setup_native/Library_sdqsmsi.mk') diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk index 8b4c485dfc2d..ff9a1bd586a7 100644 --- a/setup_native/Library_sdqsmsi.mk +++ b/setup_native/Library_sdqsmsi.mk @@ -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 \ )) -- cgit