From b9585b8a8076c5375062a3784f68ca30f2ce277c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Mon, 26 Sep 2022 10:12:48 +0000
Subject: [PATCH] Merge branch 'upgrade_sdl_windows' into 'master'

bump sdl from 2.0.22 to 2.0.24 for windows

Closes #6924

See merge request OpenMW/openmw!2425

(cherry picked from commit 483f370b01a27ea9ebadc8cec4113d8dcfe1aab6)

4c5c449b bump sdl from 2.0.22 to 2.0.24 for windows
36b4e692 Update CI/before_script.msvc.sh
ef92281b Update CI/before_script.msvc.sh
3c173646 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 909f1bde7c..f46963b75d 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.24.0" \
+		"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" \
@@ -945,17 +945,17 @@ printf "Qt 5.15.2... "
 cd $DEPS
 echo
 # SDL2
-printf "SDL 2.0.22... "
+printf "SDL 2.24.0... "
 {
-	if [ -d SDL2-2.0.22 ]; then
+	if [ -d SDL2-2.24.0 ]; 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.24.0
+		eval 7z x -y SDL2-devel-2.24.0-VC.zip $STRIP
 	fi
-	export SDL2DIR="$(real_pwd)/SDL2-2.0.22"
+	export SDL2DIR="$(real_pwd)/SDL2-2.24.0"
 	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.24.0/lib/x${ARCHSUFFIX}/SDL2.dll"
 	done
 	echo Done.
 }