From 8f6d04187e75311f79127a77ccce1e07de7171a3 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 27 Jul 2022 02:58:54 +0300 Subject: [PATCH 42/42] installer_cross: Build gtk4-client installer See osdn #45246 Signed-off-by: Marko Lindqvist --- windows/installer_cross/build_all_installers.sh | 10 ++++++++++ windows/installer_cross/installer_build.sh | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/windows/installer_cross/build_all_installers.sh b/windows/installer_cross/build_all_installers.sh index ec4bdbc3f4..c6072baa0e 100755 --- a/windows/installer_cross/build_all_installers.sh +++ b/windows/installer_cross/build_all_installers.sh @@ -91,6 +91,15 @@ else SDL2="Success" fi +if test "$CROSSER_GTK4" != "yes" ; then + GTK4="N/A" +elif ! ./installer_build.sh "$DLLSPATH" gtk4 ; then + RET=1 + GTK4="Fail" +else + GTK4="Success" +fi + if test "$CROSSER_QT6" != "yes" ; then RULEDIT="N/A" elif ! ./installer_build.sh $DLLSPATH ruledit ; then @@ -101,6 +110,7 @@ else fi echo "Gtk3.22: $GTK322" +echo "Gtk4: $GTK4" echo "Qt5: $QT5" echo "Qt6: $QT6" echo "Sdl2: $SDL2" diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index dd4b703628..091d38db0b 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -53,6 +53,7 @@ add_gtk4_env() { cp $1/bin/libgtk-4-1.dll $2/ && cp $1/bin/libgraphene-1.0-0.dll $2/ && cp $1/bin/libcairo-script-interpreter-2.dll $2/ && + cp $1/bin/libtiff-5.dll $2/ && cp $1/bin/gdbus.exe $2/ && cp $1/bin/gtk4-update-icon-cache.exe $2/bin/ && cp ./helpers/installer-helper-gtk4.cmd $2/bin/installer-helper.cmd @@ -68,8 +69,7 @@ add_sdl2_mixer_env() { add_sdl2_env() { cp $1/bin/SDL2_image.dll $2/ && - cp $1/bin/SDL2_ttf.dll $2/ && - cp $1/bin/libtiff-5.dll $2/ + cp $1/bin/SDL2_ttf.dll $2/ } add_qt5_env() { -- 2.35.1