mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 09:23:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'sdl2_point_22' into 'master'

Browse source 
Fix mouse clicking with sdl2 2.0.22

Closes #6678

See merge request OpenMW/openmw!2101
This commit is contained in:
psi29a 2022-07-06 06:32:24 +00:00
commit b2766b0650
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

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