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
coverity_clang_test
AnyOldName3 2 years ago
commit 483f370b01

@ -628,9 +628,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
fi fi
# SDL2 # SDL2
download "SDL 2.0.22" \ download "SDL 2.24.0" \
"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.22.zip" \ "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-devel-2.24.0-VC.zip" \
"SDL2-2.0.22.zip" "SDL2-devel-2.24.0-VC.zip"
# LZ4 # LZ4
download "LZ4 1.9.2" \ download "LZ4 1.9.2" \
@ -945,17 +945,17 @@ printf "Qt 5.15.2... "
cd $DEPS cd $DEPS
echo echo
# SDL2 # 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. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf SDL2-2.0.22 rm -rf SDL2-2.24.0
eval 7z x -y SDL2-2.0.22.zip $STRIP eval 7z x -y SDL2-devel-2.24.0-VC.zip $STRIP
fi fi
export SDL2DIR="$(real_pwd)/SDL2-2.0.22" export SDL2DIR="$(real_pwd)/SDL2-2.24.0"
for config in ${CONFIGURATIONS[@]}; do 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 done
echo Done. echo Done.
} }

Loading…
Cancel
Save