From d56b63a66181b4f029e91dcea095e9eb149895b7 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 1 Jul 2024 16:57:03 +0200 Subject: 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. --- build-aux/speedo.mk | 2 ++ 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 -- cgit v1.2.3