mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 03:15:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'upgrade_sdl_windows' into 'master'

Browse source 
bump sdl from 2.0.22 to 2.0.24 for windows

Closes #6924

See merge request OpenMW/openmw!2425

(cherry picked from commit 483f370b01)

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
This commit is contained in:
AnyOldName3 2022-09-26 10:12:48 +00:00 committed by psi29a
parent 022f245150
commit b9585b8a80
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CI/before_script.msvc.sh
View file

@ -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.
}