diff options
| author | Werner Koch <wk@gnupg.org> | 2024-07-01 16:57:03 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2024-07-01 16:57:03 +0200 |
| commit | d56b63a66181b4f029e91dcea095e9eb149895b7 (patch) | |
| tree | 68d5d373494a974bae58a3dfad358f1cbbc9f0b4 | |
| parent | gpgconf: Allow listing of some new options (diff) | |
| download | gnupg2-d56b63a66181b4f029e91dcea095e9eb149895b7.tar.xz gnupg2-d56b63a66181b4f029e91dcea095e9eb149895b7.zip | |
speedo,w32: Add extra flags for gpgrt and fix SO name of libassuan.
--
Due to the recently introduced use of STARTUPINFOEXW in gpgrt we now
need at least Windows Vista. Version 8 of Mingw defaults to XP SP2
which requires us to explicit override that default.
The SO number of libassuan needs an update too.
| -rw-r--r-- | build-aux/speedo.mk | 2 | ||||
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index a98d61f71..4708dd655 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -483,6 +483,8 @@ speedo_pkg_npth_configure = --enable-static speedo_pkg_libgpg_error_configure = --enable-static speedo_pkg_w64_libgpg_error_configure = --enable-static +speedo_pkg_libgpg_error_extracflags = -D_WIN32_WINNT=0x0600 +speedo_pkg_w64_libgpg_error_extracflags = -D_WIN32_WINNT=0x0600 speedo_pkg_libassuan_configure = --enable-static speedo_pkg_w64_libassuan_configure = --enable-static diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index acd32ad27..0088d1632 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -820,7 +820,7 @@ SectionEnd Section "-assuan" SEC_assuan SetOutPath "$INSTDIR\bin" - File bin/libassuan-0.dll + File bin/libassuan-9.dll SetOutPath "$INSTDIR\lib" File /oname=libassuan.imp lib/libassuan.dll.a SetOutPath "$INSTDIR\include" @@ -1231,7 +1231,7 @@ Section "-un.ksba" SectionEnd Section "-un.assuan" - Delete "$INSTDIR\bin\libassuan-0.dll" + Delete "$INSTDIR\bin\libassuan-9.dll" Delete "$INSTDIR\lib\libassuan.imp" Delete "$INSTDIR\include\assuan.h" SectionEnd |