From 4b3a6775f80d2a35ae2b3f8144d4977278fabfde Mon Sep 17 00:00:00 2001
From: slipher <slipher@protonmail.com>
Date: Mon, 7 Sep 2026 01:53:26 -0500
Subject: [PATCH 01/10] Remove amd64 bootstrap usage from deps

---
 external_deps/build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 7cdbbde02c..38557f86ab 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -1106,7 +1106,6 @@ build_naclruntime() {
 
 	cd "${dir_name}"
 	env -i /usr/bin/env bash -l -c "python3 /usr/bin/scons --mode=opt-linux 'platform=${NACL_ARCH}' werror=0 sysinfo=0 sel_ldr"
-	smart_copy "scons-out/opt-linux-${NACL_ARCH}/staging/nacl_helper_bootstrap" "${PREFIX}/nacl_helper_bootstrap"
 	smart_copy "scons-out/opt-linux-${NACL_ARCH}/staging/sel_ldr" "${PREFIX}/nacl_loader"
 }
 

From 333dccde46e1b13e7c55dcb4792d65d9ddc28e75 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 01:16:29 +0200
Subject: [PATCH 02/10] external_deps: make possible to reconfigure for a
 different target

---
 external_deps/build.sh | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 38557f86ab..74c860f932 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -1323,23 +1323,34 @@ common_setup() {
 	common_setup_arch
 
 	EXE_EXT="${EXE_EXT:-}"
-	DOWNLOAD_DIR="${WORK_DIR}/download_cache"
-	PKG_BASEDIR="${PLATFORM}_${DEPS_VERSION}"
-	PKG_TARBALL="${PKG_BASEDIR}.tar.xz"
-	BUILD_BASEDIR="build-${PKG_BASEDIR}"
-	BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}"
-	PREFIX="${BUILD_DIR}/prefix"
-	PATH="${PREFIX}/bin:${PATH}"
+
+	if "${GLOBAL_SETUP_ONCE:-true}"
+	then
+		DOWNLOAD_DIR="${WORK_DIR}/download_cache"
+		PKG_BASEDIR="${PLATFORM}_${DEPS_VERSION}"
+		PKG_TARBALL="${PKG_BASEDIR}.tar.xz"
+		BUILD_BASEDIR="build-${PKG_BASEDIR}"
+		BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}"
+		PREFIX="${BUILD_DIR}/prefix"
+		PATH="${PREFIX}/bin:${PATH}"
+
+		mkdir -p "${DOWNLOAD_DIR}"
+		mkdir -p "${PREFIX}/bin"
+		mkdir -p "${PREFIX}/include"
+		mkdir -p "${PREFIX}/lib"
+
+		export PATH
+
+		GLOBAL_SETUP_ONCE='false'
+	fi
+
 	PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${CROSS_PKG_CONFIG_PATH}"
 	CPPFLAGS+=" -I${PREFIX}/include"
 	LDFLAGS+=" -L${PREFIX}/lib"
 
-	mkdir -p "${DOWNLOAD_DIR}"
-	mkdir -p "${PREFIX}/bin"
-	mkdir -p "${PREFIX}/include"
-	mkdir -p "${PREFIX}/lib"
-
-	export CC CXX LD AR RANLIB STRIP PKG_CONFIG PKG_CONFIG_PATH PATH CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	export PKG_CONFIG PKG_CONFIG_PATH
+	export CC CXX LD AR RANLIB STRIP
+	export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 }
 
 common_setup_arch() {

From d2e5cf95f678795cd3edb06abe07dec62ecee818 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 01:59:46 +0200
Subject: [PATCH 03/10] external_deps: make defaults resetable with
 setup_default()

---
 external_deps/build.sh | 64 +++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 74c860f932..e4ef4a047f 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -63,26 +63,6 @@ NCURSES_VERSION=6.5
 WASISDK_VERSION=16.0
 WASMTIME_VERSION=2.0.2
 
-# Require the compiler names to be explicitly hardcoded, we should not inherit them
-# from environment as we heavily cross-compile.
-CC='false'
-CXX='false'
-# Set defaults.
-LD='ld'
-AR='ar'
-RANLIB='ranlib'
-PKG_CONFIG='pkg-config'
-CROSS_PKG_CONFIG_PATH=''
-LIBS_SHARED='OFF'
-LIBS_STATIC='ON'
-CMAKE_TOOLCHAIN=''
-# Always reset flags, we heavily cross-compile and must not inherit any stray flag
-# from environment.
-CPPFLAGS=''
-CFLAGS='-O3 -fPIC'
-CXXFLAGS='-O3 -fPIC'
-LDFLAGS='-O3 -fPIC'
-
 log() {
 	level="${1}"; shift
 	printf '%s: %s\n' "${level}" "${@}" >&2
@@ -1322,8 +1302,6 @@ common_setup() {
 	"common_setup_${1}"
 	common_setup_arch
 
-	EXE_EXT="${EXE_EXT:-}"
-
 	if "${GLOBAL_SETUP_ONCE:-true}"
 	then
 		DOWNLOAD_DIR="${WORK_DIR}/download_cache"
@@ -1429,8 +1407,42 @@ common_setup_linux() {
 	CXXFLAGS+=' -fPIC'
 }
 
+setup_default() {
+	# Require the compiler names to be explicitly hardcoded, we should not inherit them
+	# from environment as we heavily cross-compile.
+	export CC='false'
+	export CXX='false'
+
+	# Set defaults.
+	export LD='ld'
+	export AR='ar'
+	export RANLIB='ranlib'
+	export STRIP='strip'
+	export PKG_CONFIG='pkg-config'
+	export CROSS_PKG_CONFIG_PATH=''
+
+	LIBS_SHARED='OFF'
+	LIBS_STATIC='ON'
+	CMAKE_TOOLCHAIN=''
+	EXE_EXT=''
+
+	# Always reset flags, we heavily cross-compile and must not inherit any stray flag
+	# from environment.
+	export CPPFLAGS=''
+	export CFLAGS='-O3 -fPIC'
+	export CXXFLAGS='-O3 -fPIC'
+	export LDFLAGS='-O3 -fPIC'
+
+	unset BITNESS
+	unset MACOS_ARCH
+	unset CMAKE_OSX_ARCHITECTURES
+	unset CROSS_PKG_CONFIG_PATH
+	unset MACOSX_DEPLOYMENT_TARGET
+}
+
 # Set up environment for 32-bit i686 Windows for Visual Studio (compile all as .dll)
 setup_windows-i686-msvc() {
+	setup_default
 	BITNESS=32
 	CFLAGS+=' -mpreferred-stack-boundary=2'
 	CXXFLAGS+=' -mpreferred-stack-boundary=2'
@@ -1439,24 +1451,28 @@ setup_windows-i686-msvc() {
 
 # Set up environment for 64-bit amd64 Windows for Visual Studio (compile all as .dll)
 setup_windows-amd64-msvc() {
+	setup_default
 	BITNESS=64
 	common_setup msvc x86_64-w64-mingw32
 }
 
 # Set up environment for 32-bit i686 Windows for MinGW (compile all as .a)
 setup_windows-i686-mingw() {
+	setup_default
 	BITNESS=32
 	common_setup mingw i686-w64-mingw32
 }
 
 # Set up environment for 64-bit amd64 Windows for MinGW (compile all as .a)
 setup_windows-amd64-mingw() {
+	setup_default
 	BITNESS=64
 	common_setup mingw x86_64-w64-mingw32
 }
 
 # Set up environment for 64-bit amd64 macOS
 setup_macos-amd64-default() {
+	setup_default
 	MACOS_ARCH=x86_64
 	# OpenAL requires 10.14.
 	export MACOSX_DEPLOYMENT_TARGET=10.14 # works with CMake
@@ -1465,21 +1481,25 @@ setup_macos-amd64-default() {
 
 # Set up environment for 32-bit i686 Linux
 setup_linux-i686-default() {
+	setup_default
 	common_setup linux i686-unknown-linux-gnu
 }
 
 # Set up environment for 64-bit amd64 Linux
 setup_linux-amd64-default() {
+	setup_default
 	common_setup linux x86_64-unknown-linux-gnu
 }
 
 # Set up environment for 32-bit little-endian hard-float arm Linux
 setup_linux-armhf-default() {
+	setup_default
 	common_setup linux arm-unknown-linux-gnueabihf
 }
 
 # Set up environment for 64-bit little-endian arm Linux
 setup_linux-arm64-default() {
+	setup_default
 	common_setup linux aarch64-unknown-linux-gnu
 }
 

From 08fa92b8fcb4aba067d9f790350e11b0cc7b1bd7 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 01:48:05 +0200
Subject: [PATCH 04/10] external_deps: extract platform components

---
 external_deps/build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index e4ef4a047f..9967c7d433 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -1302,6 +1302,11 @@ common_setup() {
 	"common_setup_${1}"
 	common_setup_arch
 
+	PLATFORM_SYSTEM="$(echo "${PLATFORM}" | cut -f1 -d-)"
+	PLATFORM_ARCH="$(echo "${PLATFORM}" | cut -f2 -d-)"
+	PLATFORM_COMPILER="$(echo "${PLATFORM}" | cut -f3 -d-)"
+	PLATFORM_TARGET="${PLATFORM_SYSTEM}-${PLATFORM_ARCH}"
+
 	if "${GLOBAL_SETUP_ONCE:-true}"
 	then
 		DOWNLOAD_DIR="${WORK_DIR}/download_cache"

From c768a6fb94380c635ddc27f608bd292bb12422e1 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 08:31:21 +0200
Subject: [PATCH 05/10] external_deps: provide a reusable framework for
 building native tools needed for cross-compilation

---
 external_deps/build.sh | 53 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 9967c7d433..490c0753e5 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -162,6 +162,18 @@ download_extract() {
 configure_build() {
 	local configure_args=()
 
+	case "${HOST}" in
+	native)
+		configure_args+=(--prefix="${NATIVE_PREFIX}")
+		configure_args+=(--libdir="${NATIVE_PREFIX}/lib")
+		;;
+	*)
+		configure_args+=(--host="${HOST}")
+		configure_args+=(--prefix="${PREFIX}")
+		configure_args+=(--libdir="${PREFIX}/lib")
+		;;
+	esac
+
 	if [ "${LIBS_SHARED}" = 'ON' ]
 	then
 		configure_args+=(--enable-shared)
@@ -183,9 +195,6 @@ configure_build() {
 	fi
 
 	./configure \
-		--host="${HOST}" \
-		--prefix="${PREFIX}" \
-		--libdir="${PREFIX}/lib" \
 		"${configure_args[@]}"
 
 	make
@@ -209,6 +218,17 @@ get_compiler_arg1() {
 cmake_build() {
 	local cmake_args=()
 
+	case "${HOST}" in
+	native)
+		cmake_args+=(-DCMAKE_PREFIX_PATH="${NATIVE_PREFIX}")
+		cmake_args+=(-DCMAKE_INSTALL_PREFIX="${NATIVE_PREFIX}")
+		;;
+	*)
+		cmake_args+=(-DCMAKE_PREFIX_PATH="${PREFIX}")
+		cmake_args+=(-DCMAKE_INSTALL_PREFIX="${PREFIX}")
+		;;
+	esac
+
 	cmake_args+=(-DCMAKE_C_COMPILER="$(get_compiler_name ${CC})")
 	cmake_args+=(-DCMAKE_CXX_COMPILER="$(get_compiler_name ${CXX})")
 	cmake_args+=(-DCMAKE_C_COMPILER_ARG1="$(get_compiler_arg1 ${CC})")
@@ -228,8 +248,6 @@ cmake_build() {
 	cmake -S . -B build \
 		-DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN}" \
 		-DCMAKE_BUILD_TYPE='Release' \
-		-DCMAKE_PREFIX_PATH="${PREFIX}" \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DBUILD_SHARED_LIBS="${LIBS_SHARED}" \
 		"${cmake_args[@]}"
 
@@ -237,7 +255,6 @@ cmake_build() {
 	cmake --install build --strip
 }
 
-# Build pkg-config, needed for opusfile.
 # As a host-mode dependency it must be provided by the system when cross-compiling.
 build_pkgconfig() {
 	local dir_name="pkg-config-${PKGCONFIG_VERSION}"
@@ -1315,14 +1332,17 @@ common_setup() {
 		BUILD_BASEDIR="build-${PKG_BASEDIR}"
 		BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}"
 		PREFIX="${BUILD_DIR}/prefix"
-		PATH="${PREFIX}/bin:${PATH}"
+		NATIVE_PREFIX="${BUILD_DIR}/native-prefix"
 
 		mkdir -p "${DOWNLOAD_DIR}"
 		mkdir -p "${PREFIX}/bin"
 		mkdir -p "${PREFIX}/include"
 		mkdir -p "${PREFIX}/lib"
+		mkdir -p "${NATIVE_PREFIX}/bin"
+		mkdir -p "${NATIVE_PREFIX}/include"
+		mkdir -p "${NATIVE_PREFIX}/lib"
 
-		export PATH
+		PATH="${NATIVE_PREFIX}/bin:${PATH}"
 
 		GLOBAL_SETUP_ONCE='false'
 	fi
@@ -1331,6 +1351,7 @@ common_setup() {
 	CPPFLAGS+=" -I${PREFIX}/include"
 	LDFLAGS+=" -L${PREFIX}/lib"
 
+	export PATH
 	export PKG_CONFIG PKG_CONFIG_PATH
 	export CC CXX LD AR RANLIB STRIP
 	export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
@@ -1354,6 +1375,8 @@ common_setup_arch() {
 		CFLAGS+=' -march=armv7-a -mfpu=neon'
 		CXXFLAGS+=' -march=armv7-a -mfpu=neon'
 		;;
+	*-native-*)
+		;;
 	*)
 		log ERROR 'Unsupported platform'
 		;;
@@ -1412,6 +1435,10 @@ common_setup_linux() {
 	CXXFLAGS+=' -fPIC'
 }
 
+common_setup_native() {
+	true
+}
+
 setup_default() {
 	# Require the compiler names to be explicitly hardcoded, we should not inherit them
 	# from environment as we heavily cross-compile.
@@ -1441,7 +1468,6 @@ setup_default() {
 	unset BITNESS
 	unset MACOS_ARCH
 	unset CMAKE_OSX_ARCHITECTURES
-	unset CROSS_PKG_CONFIG_PATH
 	unset MACOSX_DEPLOYMENT_TARGET
 }
 
@@ -1508,6 +1534,15 @@ setup_linux-arm64-default() {
 	common_setup linux aarch64-unknown-linux-gnu
 }
 
+# Set up environment for native host tools
+setup_native() {
+	setup_default
+	CC='cc'
+	CXX='c++'
+	PLATFORM='native-native-native'
+	common_setup native native
+}
+
 base_windows_amd64_msvc_packages='zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk depcheck genlib'
 all_windows_amd64_msvc_packages="${base_windows_amd64_msvc_packages}"
 

From 7d86a23e1bbe4b82140115582b731106e185df9a Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 08:49:11 +0200
Subject: [PATCH 06/10] external_deps: build pkg-config as a native tool

---
 external_deps/build.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 490c0753e5..0ca49aa3c9 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -255,26 +255,26 @@ cmake_build() {
 	cmake --install build --strip
 }
 
-# As a host-mode dependency it must be provided by the system when cross-compiling.
-build_pkgconfig() {
+# Build pkg-config, needed for opusfile on macos.
+# It is part of the cross-compilation toolchain.
+# As a host-mode native dependency it must be provided by the system when cross-compiling.
+build_native-pkgconfig() {
 	local dir_name="pkg-config-${PKGCONFIG_VERSION}"
 	local archive_name="${dir_name}.tar.gz"
 
-	download_extract pkgconfig "${archive_name}" \
+	download_extract native-pkgconfig "${archive_name}" \
 		"${PKGCONFIG_BASEURL}/${archive_name}"
 
 	"${download_only}" && return
 
 	cd "${dir_name}"
 
-	# Reset the environment variables, we don't cross-compile this,
-	# it is part of the cross-compilation toolchain.
-	# CXXFLAGS is unused.
-	CFLAGS='-Wno-error=int-conversion' \
-	LDFLAGS='' \
-	HOST='' \
-	configure_build \
+	(
+		setup_native
+		CFLAGS='-Wno-error=int-conversion' \
+		configure_build \
 		--with-internal-glib
+	)
 }
 
 # Build NASM
@@ -1555,7 +1555,7 @@ all_windows_amd64_mingw_packages="${base_windows_amd64_mingw_packages}"
 base_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 all_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 
-base_macos_amd64_default_packages='pkgconfig nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
+base_macos_amd64_default_packages='native-pkgconfig nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
 all_macos_amd64_default_packages="${base_macos_amd64_default_packages}"
 
 base_linux_i686_default_packages='sdl3 naclsdk'
@@ -1596,7 +1596,7 @@ printHelp() {
 	    all     linux windows macos
 
 	Packages:
-	    pkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
+	    native-pkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
 
 	Virtual packages:
 	    base    build packages for pre-built binaries to be downloaded when building the game

From 44dbad99a283076eb6ce5c47ef0d11d882c1622f Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 09:05:48 +0200
Subject: [PATCH 07/10] external_deps: build nasm as a native tool

---
 external_deps/build.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 0ca49aa3c9..2d49b02155 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -277,19 +277,21 @@ build_native-pkgconfig() {
 	)
 }
 
-# Build NASM
-build_nasm() {
+# Build NASM, needed for jpeg on macos-amd64.
+# It is part of the compilation toolchain.
+# As a host-mode native dependency it must be provided by the system when compiling.
+build_native-nasm() {
 	case "${PLATFORM}" in
 	macos-*-*)
 		local dir_name="nasm-${NASM_VERSION}"
 		local archive_name="${dir_name}-macosx.zip"
 
-		download_extract nasm "${archive_name}" \
+		download_extract native-nasm "${archive_name}" \
 			"${NASM_BASEURL}/${NASM_VERSION}/macosx/${archive_name}"
 
 		"${download_only}" && return
 
-		smart_copy "${dir_name}/nasm" "${PREFIX}/bin"
+		smart_copy "${dir_name}/nasm" "${NATIVE_PREFIX}/bin"
 		;;
 	*)
 		log ERROR 'Unsupported platform for NASM'
@@ -1555,7 +1557,7 @@ all_windows_amd64_mingw_packages="${base_windows_amd64_mingw_packages}"
 base_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 all_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 
-base_macos_amd64_default_packages='native-pkgconfig nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
+base_macos_amd64_default_packages='native-pkgconfig native-nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
 all_macos_amd64_default_packages="${base_macos_amd64_default_packages}"
 
 base_linux_i686_default_packages='sdl3 naclsdk'
@@ -1596,7 +1598,7 @@ printHelp() {
 	    all     linux windows macos
 
 	Packages:
-	    native-pkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
+	    native-pkgconfig native-nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
 
 	Virtual packages:
 	    base    build packages for pre-built binaries to be downloaded when building the game

From 207261bd88215edd5d94923aeed80f4bddeea4bf Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Sat, 27 Jun 2026 04:42:36 +0200
Subject: [PATCH 08/10] external_deps: rework the cmake toolchain configuration

---
 external_deps/build.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 2d49b02155..0ad40c9583 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -237,6 +237,11 @@ cmake_build() {
 	cmake_args+=(-DCMAKE_CXX_FLAGS="${CXXFLAGS}")
 	cmake_args+=(-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}")
 
+	if [ -n "${CMAKE_TOOLCHAIN:-}" ]
+	then
+		cmake_args+=(-DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN}")
+	fi
+
 	# Check for ${@} not being empty to workaround a macOS bash limitation.
 	if [ -n "${1:-}" ]
 	then
@@ -246,7 +251,6 @@ cmake_build() {
 	rm -rf build
 
 	cmake -S . -B build \
-		-DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN}" \
 		-DCMAKE_BUILD_TYPE='Release' \
 		-DBUILD_SHARED_LIBS="${LIBS_SHARED}" \
 		"${cmake_args[@]}"
@@ -1457,7 +1461,7 @@ setup_default() {
 
 	LIBS_SHARED='OFF'
 	LIBS_STATIC='ON'
-	CMAKE_TOOLCHAIN=''
+
 	EXE_EXT=''
 
 	# Always reset flags, we heavily cross-compile and must not inherit any stray flag
@@ -1469,8 +1473,7 @@ setup_default() {
 
 	unset BITNESS
 	unset MACOS_ARCH
-	unset CMAKE_OSX_ARCHITECTURES
-	unset MACOSX_DEPLOYMENT_TARGET
+	unset CMAKE_TOOLCHAIN
 }
 
 # Set up environment for 32-bit i686 Windows for Visual Studio (compile all as .dll)

From 968fcf10f24b17e9f1d41b80b07a394b52346817 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Sat, 27 Jun 2026 04:36:07 +0200
Subject: [PATCH 09/10] external_deps: rework the macos configuration

---
 external_deps/build.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 0ad40c9583..0d2b047ebe 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -229,6 +229,13 @@ cmake_build() {
 		;;
 	esac
 
+	case "${PLATFORM}" in
+	macos-*)
+		cmake_args+=(-DCMAKE_OSX_ARCHITECTURES="${MACOS_ARCH}")
+		cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOS_VERSION}")
+		;;
+	esac
+
 	cmake_args+=(-DCMAKE_C_COMPILER="$(get_compiler_name ${CC})")
 	cmake_args+=(-DCMAKE_CXX_COMPILER="$(get_compiler_name ${CXX})")
 	cmake_args+=(-DCMAKE_C_COMPILER_ARG1="$(get_compiler_arg1 ${CC})")
@@ -1426,10 +1433,9 @@ common_setup_macos() {
 	CC='clang'
 	CXX='clang++'
 	STRIP='strip'
-	CFLAGS+=" -arch ${MACOS_ARCH}"
-	CXXFLAGS+=" -arch ${MACOS_ARCH}"
-	LDFLAGS+=" -arch ${MACOS_ARCH}"
-	export CMAKE_OSX_ARCHITECTURES="${MACOS_ARCH}"
+	CFLAGS+=" -arch ${MACOS_ARCH} -mmacosx-version-min=${MACOS_VERSION}"
+	CXXFLAGS+=" -arch ${MACOS_ARCH} -mmacosx-version-min=${MACOS_VERSION}"
+	LDFLAGS+=" -arch ${MACOS_ARCH} -mmacosx-version-min=${MACOS_VERSION}"
 }
 
 common_setup_linux() {
@@ -1473,6 +1479,8 @@ setup_default() {
 
 	unset BITNESS
 	unset MACOS_ARCH
+	unset MACOS_VERSION
+	unset MACOS_HOST
 	unset CMAKE_TOOLCHAIN
 }
 
@@ -1506,13 +1514,18 @@ setup_windows-amd64-mingw() {
 	common_setup mingw x86_64-w64-mingw32
 }
 
+setup_macos() {
+	MACOS_HOST="${MACOS_ARCH}-apple-macos${MACOS_VERSION}"
+	common_setup macos "${MACOS_HOST}"
+}
+
 # Set up environment for 64-bit amd64 macOS
 setup_macos-amd64-default() {
 	setup_default
 	MACOS_ARCH=x86_64
 	# OpenAL requires 10.14.
-	export MACOSX_DEPLOYMENT_TARGET=10.14 # works with CMake
-	common_setup macos "x86_64-apple-macos${MACOSX_DEPLOYMENT_TARGET}"
+	MACOS_VERSION='10.14'
+	setup_macos
 }
 
 # Set up environment for 32-bit i686 Linux

From 5c93bd8d4dacf67ef96080a7e4ac333d8e0a56c2 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 7 Jul 2026 09:41:54 +0200
Subject: [PATCH 10/10] external_deps: set MinGW flags as flags

---
 external_deps/build.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 0d2b047ebe..e2cad475a8 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -236,10 +236,8 @@ cmake_build() {
 		;;
 	esac
 
-	cmake_args+=(-DCMAKE_C_COMPILER="$(get_compiler_name ${CC})")
-	cmake_args+=(-DCMAKE_CXX_COMPILER="$(get_compiler_name ${CXX})")
-	cmake_args+=(-DCMAKE_C_COMPILER_ARG1="$(get_compiler_arg1 ${CC})")
-	cmake_args+=(-DCMAKE_CXX_COMPILER_ARG1="$(get_compiler_arg1 ${CXX})")
+	cmake_args+=(-DCMAKE_C_COMPILER="${CC}")
+	cmake_args+=(-DCMAKE_CXX_COMPILER="${CXX}")
 	cmake_args+=(-DCMAKE_C_FLAGS="${CFLAGS}")
 	cmake_args+=(-DCMAKE_CXX_FLAGS="${CXXFLAGS}")
 	cmake_args+=(-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}")
@@ -1417,9 +1415,11 @@ common_setup_windows() {
 common_setup_msvc() {
 	LIBS_SHARED='ON'
 	LIBS_STATIC='OFF'
+	CC="${HOST}-gcc"
+	CXX="${HOST}-g++"
 	# Libtool bug prevents -static-libgcc from being set in LDFLAGS
-	CC="${HOST}-gcc -static-libgcc"
-	CXX="${HOST}-g++ -static-libgcc"
+	CFLAGS+=' -static-libgcc'
+	CXXFLAGS+=' -static-libgcc'
 	common_setup_windows
 }