diff options
| author | JosJuice <josjuice@gmail.com> | 2025-11-02 19:18:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-02 19:18:56 +0100 |
| commit | cc69cc3f2eec9b4deef7969e36fc81d5938994e5 (patch) | |
| tree | 3581b94261bcd444c3be975c55fd8e356d0c78c3 | |
| parent | a4a4416ff20db79a57789931449bc80e38800b8d (diff) | |
| parent | fc7241dec373509773f02ec7a74bb7fb5908e817 (diff) | |
Merge pull request #14058 from jordan-woyak/sdl-version-bump
Externals: Bump SDL submodule version to release-3.2.26
| -rw-r--r-- | Externals/SDL/CMakeLists.txt | 10 | ||||
| m--------- | Externals/SDL/SDL | 0 | ||||
| -rw-r--r-- | Externals/SDL/SDL3.vcxproj | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Externals/SDL/CMakeLists.txt b/Externals/SDL/CMakeLists.txt index 1f34328b27..9e054f77d9 100644 --- a/Externals/SDL/CMakeLists.txt +++ b/Externals/SDL/CMakeLists.txt @@ -7,6 +7,16 @@ set(SDL_DISABLE_INSTALL_DOCS ON) set(SDL_INSTALL_TESTS OFF) set(SDL_UNIX_CONSOLE_BUILD ON) +set(SDL_AUDIO OFF) +if (NOT APPLE) + # Working around cocoa/SDL_tray.m linker errors. + set(SDL_VIDEO OFF) +endif() +set(SDL_GPU OFF) +set(SDL_RENDER OFF) +set(SDL_CAMERA OFF) +set(SDL_DIALOG OFF) + add_subdirectory(SDL) if (TARGET SDL3) diff --git a/Externals/SDL/SDL b/Externals/SDL/SDL -Subproject a8589a84226a6202831a3d49ff4edda4acab9ac +Subproject badbf8da4ee72b3ef599c721ffc9899e8d7c8d9 diff --git a/Externals/SDL/SDL3.vcxproj b/Externals/SDL/SDL3.vcxproj index c4cafbefc0..63e0f81b8a 100644 --- a/Externals/SDL/SDL3.vcxproj +++ b/Externals/SDL/SDL3.vcxproj @@ -18,7 +18,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalIncludeDirectories>SDL\src;SDL\include;SDL\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>HAVE_LIBC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>SDL_AUDIO_DISABLED;SDL_VIDEO_DISABLED;SDL_GPU_DISABLED;SDL_RENDER_DISABLED;SDL_CAMERA_DISABLED;SDL_DIALOG_DISABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> @@ -399,7 +399,6 @@ <ClCompile Include="SDL\src\render\opengl\SDL_shaders_gl.c" /> <ClCompile Include="SDL\src\render\opengles2\SDL_render_gles2.c" /> <ClCompile Include="SDL\src\render\opengles2\SDL_shaders_gles2.c" /> - <ClCompile Include="SDL\src\render\SDL_d3dmath.c" /> <ClCompile Include="SDL\src\render\SDL_render.c" /> <ClCompile Include="SDL\src\render\SDL_render_unsupported.c" /> <ClCompile Include="SDL\src\render\SDL_yuv_sw.c" /> |