From b7925a1d393df11424d649d2522a8d90b2df0396 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 1 Dec 2022 20:16:18 +0200
Subject: [PATCH 35/35] installer_cross: Check that crosser setup is supported

See osdn #46126

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/meson-winbuild.sh | 5 +++++
 windows/installer_cross/winbuild.sh       | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index d1db8aa41c..23c8c10c74 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -65,6 +65,11 @@ fi
 
 SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//' -e 's/"//')
 
+if ! test -f "meson/cross-${SETUP}.tmpl" ; then
+  echo "Unsupported crosser setup \"${SETUP}\"!" >&2
+  exit 1
+fi
+
 QTPARAMS=""
 
 case $GUI in
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index 786c8245c4..cc01877e18 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -115,20 +115,23 @@ if ! mkdir -p "${BUILD_DIR}" ; then
   exit 1
 fi
 
-if test x$SETUP = xwin64 ; then
+if test "$SETUP" = "win64" ; then
   TARGET=x86_64-w64-mingw32
   if test "x$SINGLE_GUI" != "xtrue" ; then
     CLIENTS="sdl2,gtk3.22"
     FCMP="gtk3,cli"
   fi
   VERREV="win64-$VERREV"
-else
+elif test "$SETUP" = "win32" ; then
   TARGET=i686-w64-mingw32
   if test "x$SINGLE_GUI" != "xtrue" ; then
     CLIENTS="sdl2,gtk3.22"
     FCMP="gtk3,cli"
   fi
   VERREV="win32-$VERREV"
+else
+  echo "Unsupported crosser setup \"${SETUP}\"!" >&2
+  exit 1
 fi
 
 if test "$SINGLE_GUI" != "true" || test "$2" = "ruledit" ; then
-- 
2.35.1