MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build][cmake] prefer USING_VERSION_SDL3 over PLATFORM_DESKTOP_SDL3

Browse Source
This commit is contained in:
Bruno Cabral 2025-09-12 07:35:46 -07:00
parent 2f47f5721d
commit 996baf680f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/LibraryConfigurations.cmake
View File

@ -104,7 +104,7 @@ elseif ("${PLATFORM}" MATCHES "SDL")
# First, check if SDL is included as a subdirectory # First, check if SDL is included as a subdirectory
if(TARGET SDL3::SDL3) if(TARGET SDL3::SDL3)
message(STATUS "Using SDL3 from subdirectory") message(STATUS "Using SDL3 from subdirectory")
set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL3") set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL")
set(LIBS_PRIVATE SDL3::SDL3) set(LIBS_PRIVATE SDL3::SDL3)
add_compile_definitions(USING_SDL3_PROJECT) add_compile_definitions(USING_SDL3_PROJECT)
elseif(TARGET SDL2::SDL2) elseif(TARGET SDL2::SDL2)
@ -120,8 +120,8 @@ elseif ("${PLATFORM}" MATCHES "SDL")
find_package(SDL3 QUIET) find_package(SDL3 QUIET)
if(SDL3_FOUND) if(SDL3_FOUND)
message(STATUS "Found SDL3 via find_package()") message(STATUS "Found SDL3 via find_package()")
set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL3")
set(LIBS_PRIVATE SDL3::SDL3) set(LIBS_PRIVATE SDL3::SDL3)
set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL")
add_compile_definitions(USING_SDL3_PACKAGE) add_compile_definitions(USING_SDL3_PACKAGE)
else() else()
# Fallback to SDL2 # Fallback to SDL2

2
src/rcore.c
View File

@ -553,8 +553,6 @@ const char *TextFormat(const char *text, ...); // Formatting of text with variab
#include "platforms/rcore_desktop_glfw.c" #include "platforms/rcore_desktop_glfw.c"
#elif defined(PLATFORM_DESKTOP_SDL) #elif defined(PLATFORM_DESKTOP_SDL)
#include "platforms/rcore_desktop_sdl.c" #include "platforms/rcore_desktop_sdl.c"
#elif defined(PLATFORM_DESKTOP_SDL3)
#include "platforms/rcore_desktop_sdl.c"
#elif (defined(PLATFORM_DESKTOP_RGFW) || defined(PLATFORM_WEB_RGFW)) #elif (defined(PLATFORM_DESKTOP_RGFW) || defined(PLATFORM_WEB_RGFW))
#include "platforms/rcore_desktop_rgfw.c" #include "platforms/rcore_desktop_rgfw.c"
#elif defined(PLATFORM_DESKTOP_WIN32) #elif defined(PLATFORM_DESKTOP_WIN32)