From 545a82dfa9b41f3f44c790c04077011aa6804a1f Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 18 Jan 2022 17:12:41 +0200
Subject: [PATCH 49/49] installer_cross: Include gtk4 modpack installer with
 sdl2-client

See osdn #43641

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/build_all_installers.sh    | 10 +++++++++-
 windows/installer_cross/create-freeciv-sdl2-nsi.sh |  2 +-
 windows/installer_cross/installer_build.sh         |  6 +++---
 windows/installer_cross/winbuild.sh                |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/windows/installer_cross/build_all_installers.sh b/windows/installer_cross/build_all_installers.sh
index 675f593087..e72bb23249 100755
--- a/windows/installer_cross/build_all_installers.sh
+++ b/windows/installer_cross/build_all_installers.sh
@@ -46,6 +46,11 @@ then
   CROSSER_QT5=yes
 fi
 
+if grep "CROSSER_GTK4" $DLLSPATH/crosser.txt | grep yes > /dev/null
+then
+  CROSSER_GTK4=yes
+fi
+
 if ! ./installer_build.sh $DLLSPATH gtk3.22 ; then
   RET=1
   GTK322="Fail"
@@ -62,7 +67,10 @@ else
   QT="Success"
 fi
 
-if ! ./installer_build.sh $DLLSPATH sdl2 ; then
+# sdl2-client comes with gtk4 modpack installer
+if test "x$CROSSER_GTK4" != "xyes" ; then
+  SDL2="N/A"
+elif ! ./installer_build.sh $DLLSPATH sdl2 ; then
   RET=1
   SDL2="Fail"
 else
diff --git a/windows/installer_cross/create-freeciv-sdl2-nsi.sh b/windows/installer_cross/create-freeciv-sdl2-nsi.sh
index 888a7260d7..8a73ae2270 100755
--- a/windows/installer_cross/create-freeciv-sdl2-nsi.sh
+++ b/windows/installer_cross/create-freeciv-sdl2-nsi.sh
@@ -122,7 +122,7 @@ cat <<EOF
   !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-gtk3.cmd" "\$DefaultLanguageCode" "\$INSTDIR\freeciv-mp-gtk3.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.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"
diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh
index 264af084a3..3a068a5fad 100755
--- a/windows/installer_cross/installer_build.sh
+++ b/windows/installer_cross/installer_build.sh
@@ -115,7 +115,7 @@ case $GUI in
     FCMP="qt" ;;
   sdl2)
     GUINAME="SDL2"
-    FCMP="gtk3" ;;
+    FCMP="gtk4" ;;
   gtk4)
     GUINAME="GTK4"
     MPGUI="gtk4"
@@ -222,8 +222,8 @@ else
         exit 1
       fi ;;
     sdl2)
-      if ! add_gtk3_env $DLLSPATH $INSTDIR ; then
-        echo "Copying gtk3 environment failed!" >&2
+      if ! add_gtk4_env $DLLSPATH $INSTDIR ; then
+        echo "Copying gtk4 environment failed!" >&2
         exit 1
       fi
       if ! add_sdl2_env $DLLSPATH $INSTDIR ; then
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index 4e207b01df..b2751d3be6 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -78,7 +78,7 @@ elif test "x$2" != "x" ; then
   CLIENTS="$2"
   case $2 in
     gtk3) FCMP="gtk3" ;;
-    sdl2) FCMP="gtk3" ;;
+    sdl2) FCMP="gtk4" ;;
     gtk3.22) FCMP="gtk3" ;;
     gtk4) FCMP="gtk4" ;;
     qt) FCMP="qt"
-- 
2.34.1