From a435e63e39a3f2913bed4817b683c3d3d5fae9d1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 11 Jan 2025 08:39:02 +0200 Subject: [PATCH 6/9] Msys2: Drop win64 (< win10) installers support See RM #911 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 10 ++-------- platforms/windows/installer_msys2/Makefile.meson | 12 +----------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 559e22ca8d..4bf81a23dd 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -21,7 +21,6 @@ is located here for quick reference for the specific freeciv revision. ==================================== - With premade environment, buildable clients are: - For "win64": gtk3.22, gtk4, sdl2, Qt5 For "win64-10": gtk3.22, gtk4, gtk4x, sdl2, Qt6, Qt6x @@ -35,7 +34,6 @@ is located here for quick reference for the specific freeciv revision. with listing of versions current at the time of this freeciv version. "" in the package names depends on the build target: - - win64 -> "x86_64" - win64-10 -> "ucrt-x86_64" 1) Install MSYS2 following the documentation on their homepage @@ -138,8 +136,6 @@ and then packages were updated to the level indicated by the date (YYMMDD) in the freeciv msys2 environment .7z package name. -Most packages are included for all of win64 and -ucrt64 (win64, with minimum requirement of Windows 10) targets. For each package listed below with in the name, actually two packages are installed; one where is replaced by 'x86_64', and @@ -187,7 +183,7 @@ empty the package cache for having smaller environment package. ==================================== Launch build target specific msys2 shell; -ucrt64.exe or mingw64.exe. +ucrt64.exe. Get the freeciv sources there somehow. Some options are: 1) Download freeciv tarball within msys2 shell with wget2 2) Use git within msys2 shell to get them from version control @@ -218,9 +214,7 @@ 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) for "win64". - This is also the lowest value that msys2 upstream supports. - For "win64-10" the default is 0x0A00 (Windows 10) + Current default is 0x0A00 (Windows 10). Problems diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 4298283ecc..48c67cd951 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -18,15 +18,7 @@ SRC_ROOT=../../.. 7ZDIR=$(OUT_DIR)/portable -ifeq ($(MSYSTEM),MINGW64) -WINARCH=win64 -ARCHDIR=mingw64 -LIBGCCDLL=libgcc_s_seh-1.dll -CPPLIBS=libstdc++-6.dll libgomp-1.dll -CRYPTOLIB_SUFFIX=-x64 -PREF_WIN_VER=0x0603 - -else ifeq ($(MSYSTEM),UCRT64) +ifeq ($(MSYSTEM),UCRT64) WINARCH=win64-10 ARCHDIR=ucrt64 LIBGCCDLL=libgcc_s_seh-1.dll @@ -71,8 +63,6 @@ endif all: all-$(WINARCH) -all-win64: gtk3.22-installer sdl2-installer gtk4-installer - all-win64-10: gtk3.22-installer sdl2-installer gtk4-installer qt6-installer ruledit-installer-qt6 qt6x-installer gtk4x-installer all-win64+: gtk3.22-installer sdl2-installer gtk4-installer qt6-installer ruledit-installer-qt6 qt6x-installer gtk4x-installer -- 2.45.2