PCSX2/archived-pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-01-31 01:15:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deps: Update to SDL3 (#12311)

Browse Source 
Co-authored-by: TheTechnician27 <TheTechnician27@users.noreply.github.com>
This commit is contained in:
TheLastRar
2025-03-02 23:04:19 +00:00
committed by GitHub
parent 582bba6c91
commit ac1a6d3348
41 changed files with 1419 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/ctest/core/CMakeLists.txt
View File

@@ -60,16 +60,16 @@ else()
target_sources(core_test PRIVATE ${multi_isa_sources})
endif()
if(WIN32 AND TARGET SDL2::SDL2)
# Copy SDL2 DLL to binary directory.
if(WIN32 AND TARGET SDL3::SDL3)
# Copy SDL3 DLL to binary directory.
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
get_property(SDL2_DLL_PATH TARGET SDL2::SDL2 PROPERTY IMPORTED_LOCATION_DEBUG)
get_property(SDL3_DLL_PATH TARGET SDL3::SDL3 PROPERTY IMPORTED_LOCATION_DEBUG)
else()
get_property(SDL2_DLL_PATH TARGET SDL2::SDL2 PROPERTY IMPORTED_LOCATION_RELEASE)
get_property(SDL3_DLL_PATH TARGET SDL3::SDL3 PROPERTY IMPORTED_LOCATION_RELEASE)
endif()
if(SDL2_DLL_PATH)
if(SDL3_DLL_PATH)
add_custom_command(TARGET core_test POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:core_test>"
COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${SDL2_DLL_PATH}" "$<TARGET_FILE_DIR:core_test>")
COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${SDL3_DLL_PATH}" "$<TARGET_FILE_DIR:core_test>")
endif()
endif()

4
tests/ctest/core/StubHost.cpp
View File

@@ -39,6 +39,10 @@ std::unique_ptr<ProgressCallback> Host::CreateHostProgressCallback()
return ProgressCallback::CreateNullProgressCallback();
}
void Host::ReportInfoAsync(const std::string_view title, const std::string_view message)
{
}
void Host::ReportErrorAsync(const std::string_view title, const std::string_view message)
{
}