From 5c6c9f515421f219b02244b8fcb46bbf53d9ceff Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 6 Jan 2023 06:58:29 +0200 Subject: [PATCH 34/34] Msys2 Makefile.meson: Explicitly set min-win-ver See osdn #46380 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.meson | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 28dcb6b0ce..9e6729ced6 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -17,25 +17,36 @@ 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 LIBGCCDLL=libgcc_s_seh-1.dll CRYPTOLIB_SUFFIX=-x64 +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=$(PREF_WIN_VER) +endif + MAGICKVER=7.Q16HDRI-10 FFIVER=8 ICUVER=72 @@ -107,7 +118,7 @@ installer-common: install-freeciv-$(GUI) install-env-$(GUI) install-freeciv-common: clean-install-common # Create build directory mkdir -p meson-build-$(WINARCH)-$(GUI) - cd meson-build-$(WINARCH)-$(GUI); meson setup ../../.. -Dprefix=`pwd`/../meson-install-$(WINARCH)-$(GUI) -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Druledit=false -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' $(EXTRA_CONFIG) + cd meson-build-$(WINARCH)-$(GUI); meson setup ../../.. -Dprefix=`pwd`/../meson-install-$(WINARCH)-$(GUI) -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Druledit=false -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) $(EXTRA_CONFIG) cd meson-build-$(WINARCH)-$(GUI); ninja cd meson-build-$(WINARCH)-$(GUI); ninja install cd meson-build-$(WINARCH)-$(GUI); ninja langstat_core.txt @@ -123,7 +134,7 @@ install-freeciv-common: clean-install-common install-ruledit-common: clean-install-common # Create build directory mkdir -p meson-build-$(WINARCH)-ruledit-$(GUI) - cd meson-build-$(WINARCH)-ruledit-$(GUI); meson setup ../../.. -Dprefix=`pwd`/../meson-install-$(WINARCH)-ruledit-$(GUI) -Dclients=[] -Dfcmp=[] -Druledit=true -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' $(EXTRA_CONFIG) + cd meson-build-$(WINARCH)-ruledit-$(GUI); meson setup ../../.. -Dprefix=`pwd`/../meson-install-$(WINARCH)-ruledit-$(GUI) -Dclients=[] -Dfcmp=[] -Druledit=true -Dreadline=false -Dcacert-path='./ssl/certs/ca-bundle.crt' -Dmin-win-ver=$(MIN_WIN_VER) $(EXTRA_CONFIG) cd meson-build-$(WINARCH)-ruledit-$(GUI); ninja cd meson-build-$(WINARCH)-ruledit-$(GUI); ninja install cd meson-build-$(WINARCH)-ruledit-$(GUI); ninja langstat_core.txt langstat_ruledit.txt -- 2.39.0