From b9dabba3cd34618f650258273056d77a09045e8a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 18 Jul 2022 18:43:21 +0300 Subject: [PATCH 56/56] Msys2 Makefile.meson: Add gtk4-client build See osdn #45151 Signed-off-by: Marko Lindqvist --- windows/Makefile.am | 2 ++ windows/installer_msys2/Makefile.meson | 30 ++++++++++++------- .../create-freeciv-gtk4-nsi.sh | 5 ++++ windows/installer_msys2/freeciv-gtk4.cmd | 3 ++ 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 windows/installer_msys2/create-freeciv-gtk4-nsi.sh create mode 100644 windows/installer_msys2/freeciv-gtk4.cmd diff --git a/windows/Makefile.am b/windows/Makefile.am index 2d0ac331b0..46e9ebe945 100644 --- a/windows/Makefile.am +++ b/windows/Makefile.am @@ -12,11 +12,13 @@ dist_noinst_DATA = \ installer_msys2/licenses/header.txt \ installer_msys2/create-freeciv-gtk-qt-nsi.sh \ installer_msys2/create-freeciv-gtk3.22-nsi.sh \ + installer_msys2/create-freeciv-gtk4-nsi.sh \ installer_msys2/create-freeciv-qt5-nsi.sh \ installer_msys2/create-freeciv-qt6-nsi.sh \ installer_msys2/create-freeciv-sdl2-nsi.sh \ installer_msys2/create-freeciv-ruledit-nsi.sh \ installer_msys2/freeciv-gtk3.22.cmd \ + installer_msys2/freeciv-gtk4.cmd \ installer_msys2/freeciv-mp-gtk3.cmd \ installer_msys2/freeciv-mp-gtk4.cmd \ installer_msys2/freeciv-mp-qt.cmd \ diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index ef9760f04e..3d324b8629 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -37,17 +37,20 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/ # Make rules # -all: gtk3.22-installer sdl2-installer +all: gtk3.22-installer sdl2-installer gtk4-installer snapshot: make -f Makefile.meson VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all ci: - make -f Makefile.meson VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer + make -f Makefile.meson VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer gtk4-installer gtk3.22-installer: make -f Makefile.meson GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 installer-common +gtk4-installer: + make -f Makefile.meson GUI=gtk4 CLIENT=gtk4 FCMP=gtk4 installer-common + sdl2-installer: make -f Makefile.meson GUI=sdl2 CLIENT=sdl2 FCMP=gtk4 installer-common @@ -173,7 +176,14 @@ FCMP_GTK4_DLLS := \ libpangoft2-1.0-0.dll \ liblzo2-2.dll \ libthai-0.dll \ - libdatrie-1.dll + libdatrie-1.dll \ + libtiff-5.dll \ + libjpeg-8.dll \ + libunistring-2.dll \ + libjbig-0.dll \ + libwebp-7.dll \ + libdeflate.dll \ + libLerc.dll install-env-gtk4-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(FCMP_GTK4_DLLS)) meson-install-$(GUI)/ @@ -186,21 +196,18 @@ install-env-gtk4-fcmp: install-env-common install-freeciv-gtk3.22: install-freeciv-common +install-freeciv-gtk4: install-freeciv-common + install-freeciv-sdl2: install-freeciv-common install-env-gtk3.22: install-env-gtk3-fcmp +install-env-gtk4: install-env-gtk4-fcmp + SDL2_DLLS := \ SDL2_ttf.dll \ libSDL2_gfx-1-0-0.dll \ - SDL2_image.dll \ - libtiff-5.dll \ - libjpeg-8.dll \ - libwebp-7.dll \ - libdeflate.dll \ - libjbig-0.dll \ - libLerc.dll \ - libunistring-2.dll + SDL2_image.dll install-env-sdl2: install-env-gtk4-fcmp # add DLLs @@ -220,4 +227,5 @@ clean-installer-common: clean: make -f Makefile.meson GUI=gtk3.22 clean-build-common clean-install-common clean-installer-common + make -f Makefile.meson GUI=gtk4 clean-build-common clean-install-common clean-installer-common make -f Makefile.meson GUI=sdl2 clean-build-common clean-install-common clean-installer-common diff --git a/windows/installer_msys2/create-freeciv-gtk4-nsi.sh b/windows/installer_msys2/create-freeciv-gtk4-nsi.sh new file mode 100644 index 0000000000..95a6694d89 --- /dev/null +++ b/windows/installer_msys2/create-freeciv-gtk4-nsi.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +# ./create-freeciv-gtk4-nsi.sh + +./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk4" "GTK4" $3 "gtk4" diff --git a/windows/installer_msys2/freeciv-gtk4.cmd b/windows/installer_msys2/freeciv-gtk4.cmd new file mode 100644 index 0000000000..82f0d3358c --- /dev/null +++ b/windows/installer_msys2/freeciv-gtk4.cmd @@ -0,0 +1,3 @@ +@echo off +if not "%1" == "auto" set LANG=%1 +start "%~n0" /D . "%~dp0\freeciv-gtk4.exe" %2 %3 %4 %5 %6 %7 %8 %9 -- 2.35.1