From 2eebf644c263974d3b03c044d8135140d034f860 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 11 Jun 2022 09:16:19 +0300 Subject: [PATCH 33/33] Msys2 Makefile.meson: Set correct arch to package name Have "win32" in win32 installer name instead of hardcoded "win64" See osdn #44689 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.meson | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index ebacd9cb0e..88a55ad5db 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -10,10 +10,12 @@ # ifeq ($(MSYSTEM),MINGW64) +WINARCH=win64 ARCHDIR=mingw64 LIBGCCDLL=libgcc_s_seh-1.dll CRYPTOLIB_SUFFIX=-x64 else ifeq ($(MSYSTEM),MINGW32) +WINARCH=win32 ARCHDIR=mingw32 LIBGCCDLL=libgcc_s_dw2-1.dll CRYPTOLIB_SUFFIX= @@ -44,10 +46,10 @@ sdl2-installer: installer-common: clean-install-common install-freeciv-$(GUI) install-env-$(GUI) # extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) - ./create-freeciv-$(CLIENT)-nsi.sh meson-install-$(GUI) $(FREECIV_VERSION) win64 > Freeciv-meson-$(FREECIV_VERSION)-$(GUI).nsi + ./create-freeciv-$(CLIENT)-nsi.sh meson-install-$(GUI) $(FREECIV_VERSION) $(WINARCH) > Freeciv-meson-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi # create installer executable mkdir -p Output - makensis Freeciv-meson-$(FREECIV_VERSION)-$(GUI).nsi + makensis Freeciv-meson-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi install-freeciv-common: # create build directory -- 2.35.1