From 04bb3bbeb991aacdb3784bc8728c001a77248f40 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 4 Jul 2022 20:29:45 +0300 Subject: [PATCH 30/30] meson-winbuild.sh: Add gtk4-client support See osdn #44943 Signed-off-by: Marko Lindqvist --- windows/installer_cross/meson-winbuild.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index b3752958d8..f601cf829b 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -22,8 +22,8 @@ fi GUI="$2" -if test "$GUI" != "gtk3.22" && test "$GUI" != "sdl2" && - test "$GUI" != "qt5" ; then +if test "$GUI" != "gtk3.22" && test "$GUI" != "gtk4" && + test "$GUI" != "sdl2" && test "$GUI" != "qt5" ; then echo "Unknown gui \"$2\"" >&2 exit 1 fi @@ -68,6 +68,8 @@ QTPARAMS="" case $GUI in gtk3.22) FCMP="gtk3" RULEDIT=false ;; + gtk4) FCMP="gtk4" + RULEDIT=false ;; sdl2) FCMP="gtk4" RULEDIT=false ;; qt5) CLIENT="qt" @@ -77,7 +79,7 @@ case $GUI in QTPARAMS="-Dqtver=qt5" ;; esac -if test "x$CLIENT" = "x" ; then +if test "$CLIENT" = "" ; then CLIENT="$GUI" fi -- 2.35.1