diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-27 17:34:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-28 07:10:31 +0200 |
| commit | 84deb15526fa9501eb57eec53e21bd6e2d7f7ce5 (patch) | |
| tree | 7786e3adee59279ea06da5edbc133855e38259b4 /setup_native/Library_regactivex.mk | |
| parent | sw: increase horizontal line parastyle default borderwidth (diff) | |
| download | core-84deb15526fa9501eb57eec53e21bd6e2d7f7ce5.tar.gz core-84deb15526fa9501eb57eec53e21bd6e2d7f7ce5.zip | |
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 <sbergman@redhat.com>
Diffstat (limited to 'setup_native/Library_regactivex.mk')
| -rw-r--r-- | setup_native/Library_regactivex.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk index 96d9095a0f28..7142b8ee0a7d 100644 --- a/setup_native/Library_regactivex.mk +++ b/setup_native/Library_regactivex.mk @@ -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 \ )) |