preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

SDL3_ttf work

Browse Source
This commit is contained in:
Henrik Rydgård
2026-05-15 13:35:21 +02:00
parent f2ac4a65be
commit 2b821037d7
4 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -2
View File
@@ -326,17 +326,21 @@ if(USING_EGL)
endif()
set(SDL_LIB_TARGET "")
set(SDL_TTF_LIB_TARGET "")
if(NOT LIBRETRO AND NOT IOS AND NOT MACOSX)
find_package(SDL3 REQUIRED)
set(SDL_LIB_TARGET SDL3::SDL3)
find_package(SDL3_ttf REQUIRED)
set(SDL_TTF_LIB_TARGET SDL3_ttf::SDL3_ttf)
add_compile_definitions(USE_SDL3_TTF)
message(STATUS "Using SDL3")
endif()
if(MACOSX AND NOT IOS)
if(USE_SYSTEM_LIBSDL2)
find_package(SDL2)
find_package(SDL2_ttf)
find_package(SDL3_ttf QUIET)
else()
find_library(SDL2Fwk SDL2 REQUIRED PATHS SDL/macOS)
message(STATUS "found SDL2Fwk=${SDL2Fwk}")
@@ -1521,7 +1525,9 @@ else()
SDL/SDLVulkanGraphicsContext.cpp
)
endif()
# SDL2_ttf integration is disabled while migrating to SDL3-only.
if(SDL_TTF_LIB_TARGET)
list(APPEND nativeExtraLibs ${SDL_TTF_LIB_TARGET})
endif()
if(APPLE)
list(APPEND nativeExtra
SDL/SDLJoystick.h