From 642742a1c85c3f7cfe6903469ee4bc5eaa9a0087 Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Thu, 26 Oct 2023 21:20:44 -0500
Subject: [PATCH] 32 Bit Builds Working.

---
 CMakeLists.txt                                       |  3 +++
 build-all.sh                                         | 10 +++++-----
 cmake/{i386-linux-gnu.cmake => i686-linux-gnu.cmake} |  6 +++---
 src/main.c                                           |  8 ++++----
 src/singe.c                                          |  3 +++
 5 files changed, 18 insertions(+), 12 deletions(-)
 rename cmake/{i386-linux-gnu.cmake => i686-linux-gnu.cmake} (88%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27b8c1f55..c7a33e558 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,8 +244,11 @@ add_executable(${CMAKE_PROJECT_NAME}
 
 
 if(WIN32)
+	# Note:  _WIN32_WINNT=0x0600 sets the minimum compatible version of
+	# Windows to Vista.  The function inet_pton() does not exist before then.
 	set(DEFINE_LIST
 		-Dmain=SDL_main
+		-D_WIN32_WINNT=0x0600
 	)
 else()
 	set(DEFINE_LIST)
diff --git a/build-all.sh b/build-all.sh
index 34c7d9304..0d2d15399 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -40,7 +40,7 @@ function buildAll() {
 		linux)
 			case "${ARCH}" in
 				x86)
-					TRIPLE="i386-linux-gnu"
+					TRIPLE="i686-linux-gnu"
 					;;
 				x86_64)
 					TRIPLE="x86_64-linux-gnu"
@@ -78,7 +78,7 @@ function buildAll() {
 	export LD_LIBRARY_PATH=${G_TARGET}
 	export PKG_CONFIG_LIBDIR=${G_TARGET}/lib/pkgconfig
 
-:<<SKIP
+#:<<SKIP
 	pushd thirdparty/SDL2
 	clearAndEnterBuild
 	cmake ${COMMON} \
@@ -117,6 +117,7 @@ function buildAll() {
 		-DSDL2MIXER_VENDORED=on \
 		-DSDL2MIXER_SAMPLES=off \
 		-DSDL2_DIR=${G_TARGET}/lib/cmake/SDL2 \
+		-DWAVPACK_ENABLE_ASM=no \
 		..
 	make install
 	popd
@@ -240,7 +241,7 @@ function buildAll() {
 	ffmpeg -f concat -safe 0 -i <(echo -e "file ${G_TARGET}/temp1.mkv\nfile ${G_TARGET}/temp2.mkv\n") -c copy ${G_TARGET}/menuBackground.mkv
 	createEmbeddedBinary ${G_TARGET}/menuBackground.mkv ${G_GENERATED}/menuBackground_mkv.h MENUBACKGROUND_MKV_H
 	rm ${G_TARGET}/temp1.mkv ${G_TARGET}/temp2.mkv ${G_TARGET}/menuBackground.mkv
-SKIP
+#SKIP
 
 :<<UNUSED
 	# === Singe Manual ===
@@ -385,8 +386,7 @@ function outputLicense() {
 }
 
 
-# Bother with 32 bit anymore?
 #buildAll linux x86
 buildAll linux x86_64
 #buildAll windows x86
-buildAll windows x86_64
+#buildAll windows x86_64
diff --git a/cmake/i386-linux-gnu.cmake b/cmake/i686-linux-gnu.cmake
similarity index 88%
rename from cmake/i386-linux-gnu.cmake
rename to cmake/i686-linux-gnu.cmake
index 9aae8d1b0..18df0f59c 100644
--- a/cmake/i386-linux-gnu.cmake
+++ b/cmake/i686-linux-gnu.cmake
@@ -19,11 +19,11 @@
 
 
 set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR i386)
+set(CMAKE_SYSTEM_PROCESSOR i686)
 
-set(CMAKE_C_COMPILER gcc)
+set(CMAKE_C_COMPILER i686-linux-gnu-gcc)
 set(CMAKE_C_FLAGS -m32)
-set(CMAKE_CXX_COMPILER g++)
+set(CMAKE_CXX_COMPILER i686-linux-gnu-g++)
 set(CMAKE_CXX_FLAGS -m32)
 
 set(KANGAROO_OS linux)
diff --git a/src/main.c b/src/main.c
index 64c06c5df..57ecfeadb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -589,13 +589,13 @@ void launcher(char *exeName, ConfigT *conf) {
 		temp = NULL;
 	}
 
-	// Init SDL_mixer  ***FIX***
-	flags = /* MIX_INIT_FLAC | */ MIX_INIT_MOD | /* MIX_INIT_MP3 | */ MIX_INIT_OGG | MIX_INIT_MID | MIX_INIT_OPUS;
+	// Init SDL_mixer
+	flags = MIX_INIT_FLAC | MIX_INIT_MID | MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG | MIX_INIT_OPUS | MIX_INIT_WAVPACK;
 	err = Mix_Init(flags);
 	if (err != flags) utilDie("%s", Mix_GetError());
 
-	// Init SDL_image  ***FIX***
-	flags = IMG_INIT_JPG | IMG_INIT_PNG |  /* IMG_INIT_TIF | */ IMG_INIT_WEBP;
+	// Init SDL_image
+	flags = IMG_INIT_AVIF | IMG_INIT_JPG | IMG_INIT_JXL | IMG_INIT_PNG | IMG_INIT_TIF | IMG_INIT_WEBP;
 	err = IMG_Init(flags);
 	if (err != flags) utilDie("%s", IMG_GetError());
 
diff --git a/src/singe.c b/src/singe.c
index e6ad3031c..a45868738 100644
--- a/src/singe.c
+++ b/src/singe.c
@@ -40,6 +40,8 @@
 // There is no serial.h, so fake it.
 LUASOCKET_API int luaopen_socket_serial(lua_State *L);
 #endif
+// There is no header for rs232 binding.  Make our own.
+int luaopen_luars232(lua_State *L);
 
 #include "main.h"
 #include "util.h"
@@ -4343,6 +4345,7 @@ void startLuaContext(lua_State *L) {
 	luaPreload(L, "lfs",           luaopen_lfs);
 	luaPreload(L, "socket.core",   luaopen_socket_core);
 	luaPreload(L, "mime.core",     luaopen_mime_core);
+    luaPreload(L, "rs232",         luaopen_luars232);
 #ifndef _WIN32
 	luaPreload(L, "socket.unix",   luaopen_socket_unix);
 	luaPreload(L, "socket.serial", luaopen_socket_serial);