Firehawk52-backup/dolphin
28
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-15 16:33:15 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14058 from jordan-woyak/sdl-version-bump

Browse Source 
Externals: Bump SDL submodule version to release-3.2.26
This commit is contained in:
JosJuice
2025-11-02 19:18:56 +01:00
committed by GitHub
parent a4a4416ff2 fc7241dec3
commit cc69cc3f2e
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Externals/SDL/CMakeLists.txt vendored
View File

@@ -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)

2
Externals/SDL/SDL vendored

Submodule Externals/SDL/SDL updated: a8589a8422...badbf8da4e

3
Externals/SDL/SDL3.vcxproj vendored
View File

@@ -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" />