Project

General

Profile

Bug #2437 » 0025-Msys2-Include-gtk3-fcmp-to-sdl-installers-in-win64-e.patch

S3_2 - Marko Lindqvist, 11/02/2026 05:04 AM

View differences:

windows/installer_msys2/Makefile.meson
ifeq ($(MSYSTEM),MINGW64)
WINARCH=win64
ARCH_FCMP=gtk3
ARCHDIR=mingw64
LIBGCCDLL=libgcc_s_seh-1.dll
CRYPTOLIB_SUFFIX=-x64
......
else ifeq ($(MSYSTEM),MINGW32)
WINARCH=win32
ARCH_FCMP=gtk3
ARCHDIR=mingw32
LIBGCCDLL=libgcc_s_dw2-1.dll
CRYPTOLIB_SUFFIX=
......
else ifeq ($(MSYSTEM),UCRT64)
WINARCH=win64-10
ARCH_FCMP=gtk4
ARCHDIR=ucrt64
LIBGCCDLL=libgcc_s_seh-1.dll
CRYPTOLIB_SUFFIX=-x64
......
else ifeq ($(MSYSTEM),CLANG64)
WINARCH=win64+
ARCH_FCMP=gtk4
ARCHDIR=clang64
LIBGCCDLL=
CRYPTOLIB_SUFFIX=-x64
......
else ifeq ($(MSYSTEM),CLANG32)
WINARCH=win32+
ARCH_FCMP=gtk4
ARCHDIR=clang32
LIBGCCDLL=
CRYPTOLIB_SUFFIX=
......
make -f $(MAKEFILE_NAME) GUI=gtk4 CLIENT=gtk4 FCMP=gtk4 installer-common
sdl2-installer:
make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=gtk4 installer-common
make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=$(ARCH_FCMP) installer-common
qt5-installer:
make -f $(MAKEFILE_NAME) EXTRA_CONFIG="-Dqtver=qt5 -Dtools=manual,ruleup,ruledit $(EXTRA_CONFIG)" GUI=qt5 CLIENT=qt FCMP=qt installer-common
......
make -f $(MAKEFILE_NAME) GUI=gtk4 CLIENT=gtk4 FCMP=gtk4 install-freeciv-gtk4
sdl2-install:
make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=gtk4 install-freeciv-sdl2
make -f $(MAKEFILE_NAME) GUI=sdl2 CLIENT=sdl2 FCMP=$(ARCH_FCMP) install-freeciv-sdl2
qt5-install:
make -f $(MAKEFILE_NAME) GUI=qt5 CLIENT=qt FCMP=qt EXTRA_CONFIG="-Dqtver=qt5 $(EXTRA_CONFIG)" install-freeciv-qt5
......
${SVTAV1ENC} \
libyuv.dll
install-env-sdl2: install-env-gtk4-fcmp
install-env-sdl2: install-env-$(FCMP)-fcmp
# Add DLLs
cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/
windows/installer_msys2/create-freeciv-sdl2-nsi.sh
ARCH_INST_PART=""
fi
if test "$4" = "win64" ; then
MP="gtk3"
else
MP="gtk4"
fi
cat <<EOF
; Freeciv Windows installer script
; some parts adapted from Wesnoth installer script
......
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "\$SMPROGRAMS\\\$STARTMENU_FOLDER"
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Server.lnk" "\$INSTDIR\freeciv-server.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-server.exe" 0 SW_SHOWMINIMIZED
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Modpack Installer.lnk" "\$INSTDIR\freeciv-mp-gtk4.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-mp-gtk4.exe" 0 SW_SHOWMINIMIZED
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv Modpack Installer.lnk" "\$INSTDIR\freeciv-mp-${MP}.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-mp-${MP}.exe" 0 SW_SHOWMINIMIZED
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Freeciv.lnk" "\$INSTDIR\freeciv-sdl2.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-sdl2.exe" 0 SW_SHOWMINIMIZED
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Documentation.lnk" "\$INSTDIR\doc\freeciv"
CreateShortCut "\$SMPROGRAMS\\\$STARTMENU_FOLDER\Uninstall.lnk" "\$INSTDIR\uninstall.exe"
(2-2/4)