mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-09 21:44:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'sdl' into 'master'

Browse Source 
Upgrade to SDL 2.0.18

Closes #4295

See merge request OpenMW/openmw!1481
This commit is contained in:
psi29a 2021-12-17 08:09:12 +00:00
commit f699d74057
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

@ -566,9 +566,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
fi fi
# SDL2 # SDL2
download "SDL 2.0.12" \ download "SDL 2.0.18" \
"https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.12.zip" \ "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/SDL2-2.0.18.zip" \
"SDL2-2.0.12.zip" "SDL2-2.0.18.zip"
# LZ4 # LZ4
download "LZ4 1.9.2" \ download "LZ4 1.9.2" \
@ -898,17 +898,17 @@ fi
cd $DEPS cd $DEPS
echo echo
# SDL2 # SDL2
printf "SDL 2.0.12... " printf "SDL 2.0.18... "
{ {
if [ -d SDL2-2.0.12 ]; then if [ -d SDL2-2.0.18 ]; then
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf SDL2-2.0.12 rm -rf SDL2-2.0.18
eval 7z x -y SDL2-2.0.12.zip $STRIP eval 7z x -y SDL2-2.0.18.zip $STRIP
fi fi
export SDL2DIR="$(real_pwd)/SDL2-2.0.12" export SDL2DIR="$(real_pwd)/SDL2-2.0.18"
for config in ${CONFIGURATIONS[@]}; do for config in ${CONFIGURATIONS[@]}; do
add_runtime_dlls $config "$(pwd)/SDL2-2.0.12/lib/x${ARCHSUFFIX}/SDL2.dll" add_runtime_dlls $config "$(pwd)/SDL2-2.0.18/lib/x${ARCHSUFFIX}/SDL2.dll"
done done
echo Done. echo Done.
} }