From bca094769c5233bc2368de159485356d03e973cd Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 28 Jun 2024 06:34:25 +0300
Subject: [PATCH 28/28] installer_cross: Drop win32 support completely

See RM #731

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 platforms/windows/Makefile.am                 |  1 -
 .../create-freeciv-gtk-qt-nsi.sh              |  2 +-
 .../create-freeciv-ruledit-nsi.sh             |  2 +-
 .../create-freeciv-sdl2-nsi.sh                |  2 +-
 .../installer_cross/setups/cross-win32.tmpl   | 23 -------------------
 5 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 platforms/windows/installer_cross/setups/cross-win32.tmpl

diff --git a/platforms/windows/Makefile.am b/platforms/windows/Makefile.am
index b925685fbe..074325e017 100644
--- a/platforms/windows/Makefile.am
+++ b/platforms/windows/Makefile.am
@@ -47,5 +47,4 @@ dist_noinst_DATA = \
 		installer_cross/meson-build_all_installers.sh	\
 		installer_cross/meson-installer_build.sh	\
 		installer_cross/meson-winbuild.sh		\
-		installer_cross/setups/cross-win32.tmpl		\
 		installer_cross/setups/cross-win64.tmpl
diff --git a/platforms/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh b/platforms/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
index 661695b07b..5bbfdc4996 100755
--- a/platforms/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
+++ b/platforms/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# ./create-freeciv-gtk-qt-nsi.sh <freeciv files dir> <output dir> <version> <gui id> <gui name> <win32|win64|win> [mp gui] [exe id] [uninstall setup script]
+# ./create-freeciv-gtk-qt-nsi.sh <freeciv files dir> <output dir> <version> <gui id> <gui name> <win64|win> [mp gui] [exe id] [uninstall setup script]
 
 if test "$8" != "" ; then
   EXE_ID="$8"
diff --git a/platforms/windows/installer_cross/create-freeciv-ruledit-nsi.sh b/platforms/windows/installer_cross/create-freeciv-ruledit-nsi.sh
index f74d0f10f4..c83b6031f5 100755
--- a/platforms/windows/installer_cross/create-freeciv-ruledit-nsi.sh
+++ b/platforms/windows/installer_cross/create-freeciv-ruledit-nsi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# ./create-freeciv-ruledit.sh <freeciv files dir> <output dir> <version> <gui id> <gui name> <win32|win64|win>
+# ./create-freeciv-ruledit.sh <freeciv files dir> <output dir> <version> <gui id> <gui name> <win64|win>
 
 ARCH_KEY_PART="crs"
 ARCH_INST_PART="-crs"
diff --git a/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh b/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh
index 8ce110def7..ae85a610be 100755
--- a/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh
+++ b/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# ./create-freeciv-sdl2-nsi.sh <freeciv files dir> <output dir> <version> <win32|win64|win> [uninstall setup script]
+# ./create-freeciv-sdl2-nsi.sh <freeciv files dir> <output dir> <version> <win64|win> [uninstall setup script]
 
 if test "$5" != "" && ! test -x "$5" ; then
   echo "$5 not an executable script" >&2
diff --git a/platforms/windows/installer_cross/setups/cross-win32.tmpl b/platforms/windows/installer_cross/setups/cross-win32.tmpl
deleted file mode 100644
index 1790233503..0000000000
--- a/platforms/windows/installer_cross/setups/cross-win32.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-[binaries]
-c = '/usr/bin/i686-w64-mingw32-gcc'
-cpp = '/usr/bin/i686-w64-mingw32-g++'
-ar = '/usr/bin/i686-w64-mingw32-ar'
-strip = '/usr/bin/i686-w64-mingw32-strip'
-pkgconfig = 'pkg-config'
-pkg-config = 'pkg-config'
-windres = '/usr/bin/i686-w64-mingw32-windres'
-
-[host_machine]
-system = 'windows'
-cpu_family = 'x86'
-cpu = 'i686'
-endian = 'little'
-
-[properties]
-cross_inc_path = '<PREFIX>/include'
-cross_lib_path = '<PREFIX>/lib'
-crosser = true
-
-[built-in options]
-c_link_args = ['-static-libgcc']
-cpp_link_args = ['-static-libgcc', '-static-libstdc++']
-- 
2.43.0