diff --git a/.github/workflows/linux_build_wx.yml b/.github/workflows/linux_build_wx.yml index f0a7243668..7f4e08ce8e 100644 --- a/.github/workflows/linux_build_wx.yml +++ b/.github/workflows/linux_build_wx.yml @@ -45,7 +45,7 @@ jobs: CCACHE_COMPRESS: true CCACHE_COMPRESSLEVEL: 9 CCACHE_MAXSIZE: 100M - SDL: SDL2-2.24.0 + SDL: SDL2-2.26.0 PATCHELF_VERSION: 0.12 steps: diff --git a/.github/workflows/scripts/linux/build-dependencies-qt.sh b/.github/workflows/scripts/linux/build-dependencies-qt.sh index 6b7f3e1667..2b5b12743a 100755 --- a/.github/workflows/scripts/linux/build-dependencies-qt.sh +++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh @@ -4,14 +4,14 @@ set -e INSTALLDIR="$HOME/deps" NPROCS="$(getconf _NPROCESSORS_ONLN)" -SDL=SDL2-2.24.0 +SDL=SDL2-2.26.0 QT=6.3.1 mkdir -p deps-build cd deps-build cat > SHASUMS < SHASUMS < + @@ -289,12 +290,15 @@ + + + diff --git a/3rdparty/sdl2/SDL.vcxproj.filters b/3rdparty/sdl2/SDL.vcxproj.filters index eec12ec2ca..1bc7b8cbea 100644 --- a/3rdparty/sdl2/SDL.vcxproj.filters +++ b/3rdparty/sdl2/SDL.vcxproj.filters @@ -542,6 +542,9 @@ joystick\hidapi + + joystick\hidapi + joystick\hidapi @@ -966,6 +969,9 @@ joystick\hidapi + + joystick\hidapi + joystick\hidapi @@ -978,9 +984,15 @@ joystick\hidapi + + joystick\hidapi + joystick\hidapi + + joystick\hidapi + joystick\hidapi