From 58578b4f51a2955fce3b0de7a5b7f8984ed63cdd Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 17 Dec 2022 20:32:36 +0200 Subject: [PATCH 35/35] Msys2 autotools: Set default MIN_WIN_VER by MSYSTEM See osdn #46303 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 5 +++-- windows/installer_msys2/Makefile.autotools | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 93cda38d95..694c46a8ae 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -215,8 +215,9 @@ Get the freeciv sources there somehow. Some options are: newer Windows versions could otherwise have. The version is set via MIN_WIN_VER variable. For values to use, see list in: https://msdn.microsoft.com/en-us/library/6sehtctf.aspx - Current default is 0x0603 (Windows 8.1). This is also the lowest - value that msys2 upstream is soon (as of spring 2022) going to support. + Current default is 0x0603 (Windows 8.1) for "win32" and "win64". + This is also the lowest value that msys2 upstream supports. + For "win64-10" the default is 0x0A00 (Windows 10) It's possible to set number of make jobs used in the build by setting suitable make parameter to MAKE_PARAMS environment variable, e,g, diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index 6feb2c4f12..4f5aa1894a 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -15,27 +15,35 @@ WINARCH=win64 ARCHDIR=mingw64 LIBGCCDLL=libgcc_s_seh-1.dll CRYPTOLIB_SUFFIX=-x64 +PREF_WIN_VER=0x0603 + else ifeq ($(MSYSTEM),MINGW32) WINARCH=win32 ARCHDIR=mingw32 LIBGCCDLL=libgcc_s_dw2-1.dll CRYPTOLIB_SUFFIX= +PREF_WIN_VER=0x0603 + else ifeq ($(MSYSTEM),UCRT64) WINARCH=win64-10 ARCHDIR=ucrt64 CRYPTOLIB_SUFFIX=-x64 LIBGCCDLL=libgcc_s_seh-1.dll +PREF_WIN_VER=0x0A00 + else ifeq ($(MSYSTEM),CLANG64) WINARCH=win64+ ARCHDIR=clang64 LIBGCCDLL= CRYPTOLIB_SUFFIX=-x64 +PREF_WIN_VER=0x0A00 + else error "Unsupported MSYSTEM environment" endif ifeq ($(MIN_WIN_VER),) -MIN_WIN_VER=0x0603 +MIN_WIN_VER=$(PREF_WIN_VER) endif ifeq ($(MAKE_PARAMS),) -- 2.35.1