From 9d55dc2b740c9895526ba058c46615106b9ee8c7 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 5 Jan 2022 23:21:48 +0200 Subject: [PATCH 39/39] installer_cross: Do not install gtk3 environment for gtk4 installer See osdn #43557 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 18 ++++++++++-------- windows/installer_cross/winbuild.sh | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 9275d16925..9b61804d9e 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -110,7 +110,7 @@ case $GUI in FCMP="gtk3" ;; gtk4) GUINAME="GTK4" - FCMP="gtk3" ;; + FCMP="gtk4" ;; ruledit) ;; *) echo "Unknown gui type \"$GUI\"" >&2 @@ -206,15 +206,17 @@ else exit 1 fi - if test "x$GUI" != "xqt" ; then - if ! add_gtk3_env $DLLSPATH $INSTDIR ; then - echo "Copying gtk3 environment failed!" >&2 - exit 1 - fi - fi - case $GUI in + gtk3.22) + if ! add_gtk3_env $DLLSPATH $INSTDIR ; then + echo "Copying gtk3 environment failed!" >&2 + exit 1 + fi ;; sdl2) + if ! add_gtk3_env $DLLSPATH $INSTDIR ; then + echo "Copying gtk3 environment failed!" >&2 + exit 1 + fi if ! add_sdl2_env $DLLSPATH $INSTDIR ; then echo "Copying SDL2 environment failed!" >&2 exit 1 diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index 0bf4539fdd..ef92de3b29 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -80,7 +80,7 @@ elif test "x$2" != "x" ; then gtk3) FCMP="gtk3" ;; sdl2) FCMP="gtk3" ;; gtk3.22) FCMP="gtk3" ;; - gtk4) FCMP="gtk3" ;; + gtk4) FCMP="gtk4" ;; qt) FCMP="qt" NLS="--disable-nls" ;; *) echo "Unknown gui \"$2\"!" >&2 -- 2.34.1