From 4c5c449b0b87b7d28f5c901c1fa3dff34eb38a83 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sat, 24 Sep 2022 15:16:35 +0000
Subject: [PATCH 1/4] bump sdl from 2.0.22 to 2.0.24 for windows

---
 CI/before_script.msvc.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 909f1bde7c..68ca3ff391 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -628,9 +628,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	fi
 
 	# SDL2
-	download "SDL 2.0.22" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.22.zip" \
-		"SDL2-2.0.22.zip"
+	download "SDL 2.0.24" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.24.zip" \
+		"SDL2-2.0.24.zip"
 
 	# LZ4
 	download "LZ4 1.9.2" \
@@ -945,17 +945,17 @@ printf "Qt 5.15.2... "
 cd $DEPS
 echo
 # SDL2
-printf "SDL 2.0.22... "
+printf "SDL 2.0.24... "
 {
-	if [ -d SDL2-2.0.22 ]; then
+	if [ -d SDL2-2.0.24 ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf SDL2-2.0.22
-		eval 7z x -y SDL2-2.0.22.zip $STRIP
+		rm -rf SDL2-2.0.24
+		eval 7z x -y SDL2-2.0.24.zip $STRIP
 	fi
-	export SDL2DIR="$(real_pwd)/SDL2-2.0.22"
+	export SDL2DIR="$(real_pwd)/SDL2-2.0.24"
 	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/SDL2-2.0.22/lib/x${ARCHSUFFIX}/SDL2.dll"
+		add_runtime_dlls $config "$(pwd)/SDL2-2.0.24/lib/x${ARCHSUFFIX}/SDL2.dll"
 	done
 	echo Done.
 }

From 36b4e6929c86489379eb68cefcb5ee44b670fc26 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sat, 24 Sep 2022 16:39:57 +0000
Subject: [PATCH 2/4] Update CI/before_script.msvc.sh

---
 CI/before_script.msvc.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 68ca3ff391..b56dfa0225 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -628,9 +628,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	fi
 
 	# SDL2
-	download "SDL 2.0.24" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.24.zip" \
-		"SDL2-2.0.24.zip"
+	download "SDL 2.24.0" \
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.24.0-win32-x64.zip" \
+		"SDL2-2.24.0-win32-x64.zip"
 
 	# LZ4
 	download "LZ4 1.9.2" \
@@ -945,17 +945,17 @@ printf "Qt 5.15.2... "
 cd $DEPS
 echo
 # SDL2
-printf "SDL 2.0.24... "
+printf "SDL 2.24.0... "
 {
-	if [ -d SDL2-2.0.24 ]; then
+	if [ -d SDL2-2.24.0 ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf SDL2-2.0.24
-		eval 7z x -y SDL2-2.0.24.zip $STRIP
+		rm -rf SDL2-2.24.0
+		eval 7z x -y SDL2-2.24.0.zip -oSDL2-2.24.0 $STRIP
 	fi
-	export SDL2DIR="$(real_pwd)/SDL2-2.0.24"
+	export SDL2DIR="$(real_pwd)/SDL2-2.24.0"
 	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/SDL2-2.0.24/lib/x${ARCHSUFFIX}/SDL2.dll"
+		add_runtime_dlls $config "$(pwd)/SDL2-2.24.0/SDL2.dll"
 	done
 	echo Done.
 }

From ef92281b4b8bb7d44108a3607f4f4082cde62188 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sat, 24 Sep 2022 17:10:26 +0000
Subject: [PATCH 3/4] Update CI/before_script.msvc.sh

---
 CI/before_script.msvc.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index b56dfa0225..3affcc9089 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -951,9 +951,8 @@ printf "SDL 2.24.0... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf SDL2-2.24.0
-		eval 7z x -y SDL2-2.24.0.zip -oSDL2-2.24.0 $STRIP
+		eval 7z x -y SDL2-2.24.0-win32-x64.zip -oSDL2-2.24.0 $STRIP
 	fi
-	export SDL2DIR="$(real_pwd)/SDL2-2.24.0"
 	for config in ${CONFIGURATIONS[@]}; do
 		add_runtime_dlls $config "$(pwd)/SDL2-2.24.0/SDL2.dll"
 	done

From 3c173646cee5fedbc3c94407695d70b8adf98407 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 26 Sep 2022 07:24:16 +0000
Subject: [PATCH 4/4] Update CI/before_script.msvc.sh

---
 CI/before_script.msvc.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 3affcc9089..f46963b75d 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -629,8 +629,8 @@ if [ -z $SKIP_DOWNLOAD ]; then
 
 	# SDL2
 	download "SDL 2.24.0" \
-		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.24.0-win32-x64.zip" \
-		"SDL2-2.24.0-win32-x64.zip"
+		"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-devel-2.24.0-VC.zip" \
+		"SDL2-devel-2.24.0-VC.zip"
 
 	# LZ4
 	download "LZ4 1.9.2" \
@@ -951,10 +951,11 @@ printf "SDL 2.24.0... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf SDL2-2.24.0
-		eval 7z x -y SDL2-2.24.0-win32-x64.zip -oSDL2-2.24.0 $STRIP
+		eval 7z x -y SDL2-devel-2.24.0-VC.zip $STRIP
 	fi
+	export SDL2DIR="$(real_pwd)/SDL2-2.24.0"
 	for config in ${CONFIGURATIONS[@]}; do
-		add_runtime_dlls $config "$(pwd)/SDL2-2.24.0/SDL2.dll"
+		add_runtime_dlls $config "$(pwd)/SDL2-2.24.0/lib/x${ARCHSUFFIX}/SDL2.dll"
 	done
 	echo Done.
 }