From f2a19c2945106f75647fbc338018492784df6ed3 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 12 Apr 2022 21:03:45 +0300 Subject: [PATCH 40/40] Msys2: Make Windows 8.1 the minimum requirement See osdn #44286 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 3 ++- meson.build | 2 +- windows/installer_msys2/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index e51526dac0..a8a49cec8d 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -185,7 +185,8 @@ 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 0x0601 (Windows 7). + 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. 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/meson.build b/meson.build index d019b966f4..73583c9cce 100644 --- a/meson.build +++ b/meson.build @@ -97,7 +97,7 @@ if host_system == 'windows' pub_conf_data.set('FREECIV_HAVE_WINSOCK', 1) pub_conf_data.set('FREECIV_SOCKET_ZERO_NOT_STDIN', 1) priv_conf_data.set('ALWAYS_ROOT', 1) - add_global_arguments('-D_WIN32_WINNT=0x0601', language : ['c', 'cpp']) + add_global_arguments('-D_WIN32_WINNT=0x0603', language : ['c', 'cpp']) net_dep = c_compiler.find_library('ws2_32') elif host_system == 'haiku' net_dep = c_compiler.find_library('network') diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 241fd26f3f..088fe3df70 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -23,7 +23,7 @@ CRYPTOLIB_SUFFIX= endif ifeq ($(MIN_WIN_VER),) -MIN_WIN_VER=0x0601 +MIN_WIN_VER=0x0603 endif ifeq ($(MAKE_PARAMS),) -- 2.35.1