diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2959bd6f9f..db2b2e334b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,6 +75,9 @@ jobs:
echo "#define PPSSPP_WIN_VERSION_NO_UPDATE 1" >> Windows/win-version.h
}
+ - name: Download SDL3
+ run: .\Windows\get-sdl3.ps1
+
- name: Build Windows
working-directory: ${{ env.GITHUB_WORKSPACE }}
run: msbuild /m /p:TrackFileAccess=false /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:Platform=${{ matrix.platform }} Windows/PPSSPP.sln
diff --git a/.gitignore b/.gitignore
index 4631907118..d39b55acc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,153 +1,154 @@
-# For MSVC
-*.lastcodeanalysissucceeded
-*.pdb
-*.ilk
-*.obj
-*.pch
-*.log
-*.dll
-*.rar
-*.exe
-*.map
-*.lib
-*.user
-*.sdf
-*.ncb
-*.opensdf
-*.suo
-*.aps
-*.exp
-*.qdact
-controls.ini
-desktop.ini
-Debug
-Release
-Windows/.vs
-Windows/x64
-Windows/ARM
-Windows/ARM64
-Windows/ipch
-Windows/bin-release
-Windows/win-version.h
-Windows/win-version-*.tmp
-android/assets
-ext/_Output
-android/lint.xml
-PPSSPPWindows64.exe.manifest
-PPSSPPWindows.exe.manifest
-PPSSPPWindowsARM64.exe.manifest
-PPSSPPWindowsARM.exe.manifest
-PPSSPPDebug64.exe.manifest
-PPSSPPDebug.exe.manifest
-PPSSPPDebugARM64.exe.manifest
-PPSSPPDebugARM.exe.manifest
-assets/flash0
-UWP/icph
-UWP/*.ipch
-UWP/Content/*
-!UWP/Content/.empty
-UWP/.vs
-.vs
-.vscode
-
-# For Mac
-.DS_Store
-PPSSPPSDL.app
-include/glslang/build_info.h
-
-# For ppsspp.ini, etc.
-ppsspp.ini
-imgui.ini
-PPSSPPControls.dat
-
-# Qt Linguist files
-*.qm
-
-# Gradle/Android Studio
-.gradle
-.idea
-*.iml
-build
-/build*/
-versionname.txt
-versioncode.txt
-android/.cxx
-
-# Temp file used by jenkins windows build (TODO: remove)
-desc.txt
-
-Logs
-Memstick
-/memstick*
-Cheats
-
-/git-version.cpp
-/git-version-*.tmp
-
-.pspsh.hist
-__testoutput.txt
-__testerror.txt
-__testfinish.txt
-__testfailure.bmp
-__testcompare.png
-GameLogNotes.txt
-screenshots
-android/assets/lang
-android/assets/flash0
-font_atlas.zim.png
-asciifont_atlas.zim.png
-ppge_atlas.zim.png
-local.properties
-r.sh
-Windows/compileData*
-Windows/*.ipch
-Windows/imgui.ini
-imgui.ini
-
-# debug file
-ui_atlas_gen.png
-buttons_rasterized.png
-
-# For vim
-*.swp
-tags
-*.ctags
-
-# Other VCS
-.bzr/
-.bzrignore
-
-# Debian build
-debian/files
-debian/ppsspp.substvars
-debian/ppsspp/
-
-# Libretro build
-*.o
-*.tmp
-*.a
-
-# YouCompleteMe file
-.ycm_extra_conf.pyc
-
-# RenderDoc
-*.rdc
-
-# CMake stuff
-CMakeFiles
-CMakeUserPresets.json
-compile_commands.json
-
-# Clangd
-.cache/
-build
-libretro/obj/local
-
-ppsspp_retroachievements.dat
-RACache
-RAPrefs_PPSSPP.cfg
-
-# For CLion
-cmake-build-*/
+# For MSVC
+*.lastcodeanalysissucceeded
+*.pdb
+*.ilk
+*.obj
+*.pch
+*.log
+*.dll
+*.rar
+*.exe
+*.map
+*.lib
+*.user
+*.sdf
+*.ncb
+*.opensdf
+*.suo
+*.aps
+*.exp
+*.qdact
+controls.ini
+desktop.ini
+Debug
+Release
+Windows/.vs
+Windows/x64
+Windows/ARM
+Windows/ARM64
+Windows/ipch
+Windows/bin-release
+Windows/win-version.h
+Windows/win-version-*.tmp
+android/assets
+ext/_Output
+ext/SDL3
+android/lint.xml
+PPSSPPWindows64.exe.manifest
+PPSSPPWindows.exe.manifest
+PPSSPPWindowsARM64.exe.manifest
+PPSSPPWindowsARM.exe.manifest
+PPSSPPDebug64.exe.manifest
+PPSSPPDebug.exe.manifest
+PPSSPPDebugARM64.exe.manifest
+PPSSPPDebugARM.exe.manifest
+assets/flash0
+UWP/icph
+UWP/*.ipch
+UWP/Content/*
+!UWP/Content/.empty
+UWP/.vs
+.vs
+.vscode
+
+# For Mac
+.DS_Store
+PPSSPPSDL.app
+include/glslang/build_info.h
+
+# For ppsspp.ini, etc.
+ppsspp.ini
+imgui.ini
+PPSSPPControls.dat
+
+# Qt Linguist files
+*.qm
+
+# Gradle/Android Studio
+.gradle
+.idea
+*.iml
+build
+/build*/
+versionname.txt
+versioncode.txt
+android/.cxx
+
+# Temp file used by jenkins windows build (TODO: remove)
+desc.txt
+
+Logs
+Memstick
+/memstick*
+Cheats
+
+/git-version.cpp
+/git-version-*.tmp
+
+.pspsh.hist
+__testoutput.txt
+__testerror.txt
+__testfinish.txt
+__testfailure.bmp
+__testcompare.png
+GameLogNotes.txt
+screenshots
+android/assets/lang
+android/assets/flash0
+font_atlas.zim.png
+asciifont_atlas.zim.png
+ppge_atlas.zim.png
+local.properties
+r.sh
+Windows/compileData*
+Windows/*.ipch
+Windows/imgui.ini
+imgui.ini
+
+# debug file
+ui_atlas_gen.png
+buttons_rasterized.png
+
+# For vim
+*.swp
+tags
+*.ctags
+
+# Other VCS
+.bzr/
+.bzrignore
+
+# Debian build
+debian/files
+debian/ppsspp.substvars
+debian/ppsspp/
+
+# Libretro build
+*.o
+*.tmp
+*.a
+
+# YouCompleteMe file
+.ycm_extra_conf.pyc
+
+# RenderDoc
+*.rdc
+
+# CMake stuff
+CMakeFiles
+CMakeUserPresets.json
+compile_commands.json
+
+# Clangd
+.cache/
+build
+libretro/obj/local
+
+ppsspp_retroachievements.dat
+RACache
+RAPrefs_PPSSPP.cfg
+
+# For CLion
+cmake-build-*/
/.vscode/
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 3e9d803465..369eed8c47 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -221,7 +221,7 @@
Use
Level3
ProgramDatabase
- ../ffmpeg/Windows/x86_64/include;../ext;../common;..;../ext/glew;../ext/zlib
+ ../ffmpeg/Windows/x86_64/include;../ext;../common;..;../ext/glew;../ext/zlib;../ext/SDL3/include
stdafx.h;Common/DbgNew.h
MultiThreadedDebug
false
@@ -233,8 +233,8 @@
stdcpp17
- d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
- ../ffmpeg/Windows/x86_64/lib
+ SDL3.lib;d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ ../ffmpeg/Windows/x86_64/lib;../ext/SDL3/lib/x64
true
$(OutDir)$(ProjectName).pdb
true
@@ -245,6 +245,10 @@
../Windows/git-version-gen.cmd PPSSPPWindows
Updating git-version.cpp
+
+ xcopy /Y /D "$(ProjectDir)..\ext\SDL3\lib\x64\SDL3.dll" "$(OutDir)"
+ Copying SDL3.dll
+
@@ -255,7 +259,7 @@
Use
Level3
ProgramDatabase
- ../ffmpeg/Windows/aarch64/include;../ext;../common;..;../ext/glew;../ext/zlib
+ ../ffmpeg/Windows/aarch64/include;../ext;../common;..;../ext/glew;../ext/zlib;../ext/SDL3/include
stdafx.h;Common/DbgNew.h
MultiThreadedDebug
false
@@ -267,8 +271,8 @@
stdcpp17
- d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)
- ../ffmpeg/Windows/aarch64/lib
+ SDL3.lib;d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)
+ ../ffmpeg/Windows/aarch64/lib;../ext/SDL3/lib/arm64
true
$(OutDir)$(ProjectName).pdb
true
@@ -279,6 +283,10 @@
../Windows/git-version-gen.cmd PPSSPPWindows
Updating git-version.cpp
+
+ xcopy /Y /D "$(ProjectDir)..\ext\SDL3\lib\arm64\SDL3.dll" "$(OutDir)"
+ Copying SDL3.dll
+
@@ -344,15 +352,15 @@
Use
Level3
ProgramDatabase
- ../ffmpeg/Windows/x86_64/include;../ext;../common;..;../ext/glew;../ext/zlib
+ ../ffmpeg/Windows/x86_64/include;../ext;../common;..;../ext/glew;../ext/zlib;../ext/SDL3/include
stdafx.h
true
$(EXTERNAL_COMPILE_OPTIONS)
stdcpp17
- d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
- ../ffmpeg/Windows/x86_64/lib;%(AdditionalLibraryDirectories)
+ SDL3.lib;d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ ../ffmpeg/Windows/x86_64/lib;../ext/SDL3/lib/x64;%(AdditionalLibraryDirectories)
true
Windows
true
@@ -365,6 +373,10 @@
../Windows/git-version-gen.cmd PPSSPPWindows
Updating git-version.cpp
+
+ xcopy /Y /D "$(ProjectDir)..\ext\SDL3\lib\x64\SDL3.dll" "$(OutDir)"
+ Copying SDL3.dll
+
$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
@@ -386,15 +398,15 @@
Use
Level3
ProgramDatabase
- ../ffmpeg/Windows/aarch64/include;../ext;../common;..;../ext/glew;../ext/zlib
+ ../ffmpeg/Windows/aarch64/include;../ext;../common;..;../ext/glew;../ext/zlib;../ext/SDL3/include
stdafx.h
true
$(EXTERNAL_COMPILE_OPTIONS)
stdcpp17
- d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)
- ../ffmpeg/Windows/aarch64/lib;%(AdditionalLibraryDirectories)
+ SDL3.lib;d2d1.lib;dwrite.lib;d3d11.lib;avrt.lib;mmdevapi.lib;wbemuuid.lib;dwmapi.lib;winhttp.lib;uxtheme.lib;mfuuid.lib;shlwapi.lib;Winmm.lib;Ws2_32.lib;comctl32.lib;dxguid.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;setupapi.lib;hid.lib;oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;%(AdditionalDependencies)
+ ../ffmpeg/Windows/aarch64/lib;../ext/SDL3/lib/arm64;%(AdditionalLibraryDirectories)
true
Windows
true
@@ -406,6 +418,10 @@
../Windows/git-version-gen.cmd PPSSPPWindows
Updating git-version.cpp
+
+ xcopy /Y /D "$(ProjectDir)..\ext\SDL3\lib\arm64\SDL3.dll" "$(OutDir)"
+ Copying SDL3.dll
+
$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
@@ -582,8 +598,8 @@
true
true
true
- true
- true
+ false
+ false
true
@@ -693,6 +709,10 @@
+
+ true
+ true
+
@@ -1027,8 +1047,8 @@
true
true
true
- true
- true
+ false
+ false
true
@@ -1138,6 +1158,7 @@
+
@@ -1442,6 +1463,7 @@
+
@@ -1451,4 +1473,4 @@
-
+
\ No newline at end of file
diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters
index bde68d098f..3ed6a4c12a 100644
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@@ -292,6 +292,9 @@
Windows\Input\Hid
+
+ Windows\Input
+
@@ -592,6 +595,9 @@
Windows\Input\Hid
+
+ Windows\Input
+
@@ -879,5 +885,6 @@
assets
+
diff --git a/Windows/SDLInput.cpp b/Windows/SDLInput.cpp
new file mode 100644
index 0000000000..ba66a34371
--- /dev/null
+++ b/Windows/SDLInput.cpp
@@ -0,0 +1 @@
+#include
diff --git a/Windows/SDLInput.h b/Windows/SDLInput.h
new file mode 100644
index 0000000000..6f70f09bee
--- /dev/null
+++ b/Windows/SDLInput.h
@@ -0,0 +1 @@
+#pragma once
diff --git a/Windows/get-sdl3.ps1 b/Windows/get-sdl3.ps1
new file mode 100644
index 0000000000..9e33d05b64
--- /dev/null
+++ b/Windows/get-sdl3.ps1
@@ -0,0 +1,31 @@
+# Downloads SDL3 VC development binaries to SDL3/ at the repo root.
+# Safe to run repeatedly — exits early if already present.
+# Update $SDL3_VERSION to upgrade.
+
+$SDL3_VERSION = "3.2.14"
+$SDL3_DIR = Join-Path $PSScriptRoot "..\ext\SDL3"
+$SENTINEL = Join-Path $SDL3_DIR "include\SDL3\SDL.h"
+
+if (Test-Path $SENTINEL) {
+ Write-Host "SDL3 $SDL3_VERSION already present."
+ exit 0
+}
+
+$URL = "https://github.com/libsdl-org/SDL/releases/download/release-$SDL3_VERSION/SDL3-devel-$SDL3_VERSION-VC.zip"
+$ZIP = Join-Path $env:TEMP "SDL3-devel-$SDL3_VERSION-VC.zip"
+$EXTRACT = Join-Path $env:TEMP "SDL3-extract-$SDL3_VERSION"
+
+Write-Host "Downloading SDL3 $SDL3_VERSION from GitHub releases..."
+Invoke-WebRequest -Uri $URL -OutFile $ZIP -UseBasicParsing
+
+Write-Host "Extracting..."
+if (Test-Path $EXTRACT) { Remove-Item -Recurse -Force $EXTRACT }
+Expand-Archive -Path $ZIP -DestinationPath $EXTRACT -Force
+
+if (Test-Path $SDL3_DIR) { Remove-Item -Recurse -Force $SDL3_DIR }
+Move-Item (Join-Path $EXTRACT "SDL3-$SDL3_VERSION") $SDL3_DIR
+
+Remove-Item -Force $ZIP
+Remove-Item -Recurse -Force $EXTRACT -ErrorAction SilentlyContinue
+
+Write-Host "SDL3 $SDL3_VERSION ready at $SDL3_DIR"
diff --git a/assets/compat.ini b/assets/compat.ini
index 28fedcf2a2..a4b8aeddfa 100644
--- a/assets/compat.ini
+++ b/assets/compat.ini
@@ -876,6 +876,9 @@ UCUS98705 = true
UCED00971 = true
UCUS98713 = true
+# Petz Saddle Club
+ULUS10402 = true
+
[FramerateHack30]
# Note that this hack is not universal, will not work for games simply added to the list
# 30 fps hacks for games that run well are disabled by default since it's only an option for users with very weak hardware