From 8554e12a7a3ca4427e5fa737b56f03e890075435 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 26 Oct 2022 02:59:06 +0300 Subject: [PATCH 31/31] Msys2 Makefile: Add initial clang64 support See osdn #45960 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 9fd9ab6cd8..4a570fb98a 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -25,6 +25,11 @@ WINARCH=win64-10 ARCHDIR=ucrt64 CRYPTOLIB_SUFFIX=-x64 LIBGCCDLL=libgcc_s_seh-1.dll +else ifeq ($(MSYSTEM),CLANG64) +WINARCH=win64+ +ARCHDIR=clang64 +LIBGCCDLL= +CRYPTOLIB_SUFFIX=-x64 else error "Unsupported MSYSTEM environment" endif @@ -69,6 +74,13 @@ all-win32: gtk3.22-installer sdl2-installer ruledit-installer-qt5 qt5-installer all-win64-10: gtk3.22-installer sdl2-installer ruledit-installer qt6-installer gtk4-installer +all-win64+: + make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" install-freeciv-gtk3.22 + make -f $(MAKEFILE_NAME) GUI=gtk4 CLIENT=gtk4 FCMP=gtk4 EXTRA_CONFIG="--disable-ruledit CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" install-freeciv-gtk4 + make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=gtk4 EXTRA_CONFIG="--disable-ruledit CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" install-freeciv-sdl2 + make -f $(MAKEFILE_NAME) GUI=qt6 CLIENT=qt FCMP=qt EXTRA_CONFIG="--with-qtver=qt6 --with-qt6-includes=/$(ARCHDIR)/include/qt6 --with-qt6-libs=/$(ARCHDIR)/lib CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT6_MOCCMD)" install-freeciv-qt6 + make -f $(MAKEFILE_NAME) EXTRA_CONFIG="CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT6_MOCCMD)" install-ruledit-qt6 + gtk3.22-installer: make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk3.22 @@ -128,7 +140,7 @@ configure-freeciv-ruledit-qt6: # install Freeciv -install-freeciv-common: configure-freeciv-common +install-freeciv-common: clean-install-common configure-freeciv-common # make .gmo and langstat files. For the former, this needs to be before 'make install' make -C build-$(WINARCH)-$(GUI)/translations/core update-po make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt @@ -559,7 +571,7 @@ install-env-ruledit-qt6: # build installer -installer-common: clean-install-common install-freeciv-$(GUI) install-env-$(GUI) +installer-common: install-freeciv-$(GUI) install-env-$(GUI) # extract Freeciv version $(eval FREECIV_VERSION := $(shell ../../fc_version)) # create NSIS script -- 2.35.1