Merge pull request #2733 from OpenMW/windows_sdl2012

give sdl2 2.0.12 for windows a try
pull/2737/head
Bret Curtis 5 years ago committed by GitHub
commit 6410f57b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -428,9 +428,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
fi fi
# SDL2 # SDL2
download "SDL 2.0.7" \ download "SDL 2.0.12" \
"https://www.libsdl.org/release/SDL2-devel-2.0.7-VC.zip" \ "https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip" \
"SDL2-2.0.7.zip" "SDL2-2.0.12.zip"
# Google test and mock # Google test and mock
if [ ! -z $TEST_FRAMEWORK ]; then if [ ! -z $TEST_FRAMEWORK ]; then
@ -697,16 +697,16 @@ fi
cd $DEPS cd $DEPS
echo echo
# SDL2 # SDL2
printf "SDL 2.0.7... " printf "SDL 2.0.12... "
{ {
if [ -d SDL2-2.0.7 ]; then if [ -d SDL2-2.0.12 ]; then
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf SDL2-2.0.7 rm -rf SDL2-2.0.12
eval 7z x -y SDL2-2.0.7.zip $STRIP eval 7z x -y SDL2-2.0.12.zip $STRIP
fi fi
export SDL2DIR="$(real_pwd)/SDL2-2.0.7" export SDL2DIR="$(real_pwd)/SDL2-2.0.12"
add_runtime_dlls "$(pwd)/SDL2-2.0.7/lib/x${ARCHSUFFIX}/SDL2.dll" add_runtime_dlls "$(pwd)/SDL2-2.0.12/lib/x${ARCHSUFFIX}/SDL2.dll"
echo Done. echo Done.
} }
cd $DEPS cd $DEPS

Loading…
Cancel
Save