Project

General

Profile

Feature #772 ยป 0011-Msys2-Drop-win32-support-completely.patch

Marko Lindqvist, 08/05/2024 05:55 AM

View differences:

platforms/windows/installer_msys2/Makefile.autotools
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
......
CRYPTOLIB_SUFFIX=-x64
PREF_WIN_VER=0x0A00
else ifeq ($(MSYSTEM),CLANG32)
WINARCH=win32+
ARCHDIR=clang32
LIBGCCDLL=
CRYPTOLIB_SUFFIX=
PREF_WIN_VER=0x0A00
else
error "Unsupported MSYSTEM environment"
endif
......
all-win64: gtk3.22-installer sdl2-installer ruledit-installer-qt5 qt5-installer gtk4-installer
all-win32: gtk3.22-installer sdl2-installer ruledit-installer-qt5 qt5-installer gtk4-installer
all-win64-10: gtk3.22-installer sdl2-installer ruledit-installer qt6-installer gtk4-installer
all-win64+:
......
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
all-win32+:
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=qt5 CLIENT=qt FCMP=qt EXTRA_CONFIG="--with-qtver=qt5 --with-qt5-includes=/$(ARCHDIR)/include/qt6 --with-qt6-libs=/$(ARCHDIR)/lib CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT5_MOCCMD)" install-freeciv-qt5
make -f $(MAKEFILE_NAME) EXTRA_CONFIG="CFLAGS=\"-Wno-cast-align $$CFLAGS\" $(EXTRA_CONFIG)" MOCCMD="$(QT5_MOCCMD)" install-ruledit-qt5
gtk3.22-installer:
make -f $(MAKEFILE_NAME) GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk3.22
platforms/windows/installer_msys2/Makefile.meson
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
......
CRYPTOLIB_SUFFIX=-x64
PREF_WIN_VER=0x0A00
else ifeq ($(MSYSTEM),CLANG32)
WINARCH=win32+
ARCHDIR=clang32
LIBGCCDLL=
CRYPTOLIB_SUFFIX=
PREF_WIN_VER=0x0A00
else
error "Unsupported MSYSTEM environment"
endif
......
all-win64: gtk3.22-installer sdl2-installer gtk4-installer qt5-installer ruledit-installer-qt5
all-win32: gtk3.22-installer sdl2-installer gtk4-installer qt5-installer ruledit-installer-qt5
all-win64-10: gtk3.22-installer sdl2-installer gtk4-installer qt6-installer ruledit-installer-qt6
all-win64+: gtk3.22-install sdl2-install gtk4-install qt6-install ruledit-install-qt6
all-win32+: gtk3.22-install sdl2-install gtk4-install qt5-install ruledit-install-qt5
snapshot:
cd $(SRC_ROOT) ; ./scripts/refresh_changelog.sh
make -f $(MAKEFILE_NAME) VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all
    (1-1/1)