debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-09-02 11:00:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX FOR DETECT PLATFORM

Browse Source
This commit is contained in:
lizzie
2026-08-12 18:09:32 +00:00
parent a2de6bd86f
commit 97cad240bb
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.patch/sdl3/0001-ps4.patch
+2 -2
View File
@@ -15,7 +15,7 @@ index 8872895..b0eeca8 100644
endif() endif()
+# Always on? +# Always on?
+if (PLATFORM_PS4) +if (OPENORBIS)
+ sdl_sources( + sdl_sources(
+ "${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_systhread.c" + "${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_systhread.c"
+ "${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_sysmutex.c" # Can be faked, if necessary + "${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_sysmutex.c" # Can be faked, if necessary
@@ -38,7 +38,7 @@ index 8872895..b0eeca8 100644
if(NOT HAVE_SDL_THREADS) if(NOT HAVE_SDL_THREADS)
# The Emscripten and N-Gage platform has been carefully vetted to work without threads # The Emscripten and N-Gage platform has been carefully vetted to work without threads
- if(EMSCRIPTEN OR NGAGE) - if(EMSCRIPTEN OR NGAGE)
+ if(EMSCRIPTEN OR NGAGE OR PLATFORM_PS4) + if(EMSCRIPTEN OR NGAGE OR OPENORBIS)
set(SDL_THREADS_DISABLED 1) set(SDL_THREADS_DISABLED 1)
sdl_glob_sources( sdl_glob_sources(
"${SDL3_SOURCE_DIR}/src/thread/generic/*.c" "${SDL3_SOURCE_DIR}/src/thread/generic/*.c"
.patch/sdl3/0002-ps4-drivers.patch
+1 -1
View File
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0eeca8..076cbe4 100644 index b0eeca8..076cbe4 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -3655,15 +3655,21 @@ if (PLATFORM_PS4) @@ -3655,15 +3655,21 @@ if (OPENORBIS)
"${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_sysrwlock.c" # Can be faked, if necessary "${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_sysrwlock.c" # Can be faked, if necessary
"${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_systls.c" "${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_systls.c"
"${SDL3_SOURCE_DIR}/src/thread/generic/SDL_syssem.c" "${SDL3_SOURCE_DIR}/src/thread/generic/SDL_syssem.c"
externals/CMakeLists.txt
Vendored
+1 -1
View File
@@ -254,7 +254,7 @@ target_include_directories(tz PUBLIC ./tz)
add_library(bc_decoder bc_decoder/bc_decoder.cpp) add_library(bc_decoder bc_decoder/bc_decoder.cpp)
target_include_directories(bc_decoder PUBLIC ./bc_decoder) target_include_directories(bc_decoder PUBLIC ./bc_decoder)
if (PLATFORM_PS4) if (OPENORBIS)
add_library(ps4sup ps4sup/emutls.c ps4sup/stub.cpp) add_library(ps4sup ps4sup/emutls.c ps4sup/stub.cpp)
target_include_directories(ps4sup PUBLIC ./ps4sup) target_include_directories(ps4sup PUBLIC ./ps4sup)
endif() endif()
src/audio_core/CMakeLists.txt
+1 -1
View File
@@ -254,7 +254,7 @@ else()
target_compile_definitions(audio_core PRIVATE HAVE_SDL3) target_compile_definitions(audio_core PRIVATE HAVE_SDL3)
endif() endif()
if(PLATFORM_PS4) if(OPENORBIS)
target_sources(audio_core PRIVATE target_sources(audio_core PRIVATE
sink/ps4_sink.cpp sink/ps4_sink.cpp
sink/ps4_sink.h) sink/ps4_sink.h)
src/dynarmic/tests/CMakeLists.txt
+1 -1
View File
@@ -135,7 +135,7 @@ target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=
add_test(NAME dynarmic_tests COMMAND dynarmic_tests --durations yes) add_test(NAME dynarmic_tests COMMAND dynarmic_tests --durations yes)
if (PLATFORM_PS4) if (OPENORBIS)
target_link_libraries(dynarmic_tests PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService ps4sup) target_link_libraries(dynarmic_tests PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService ps4sup)
create_ps4_eboot(dynarmic_tests dynarmic_tests IV0000-BREW00090_00-DYNARMICTS000000) create_ps4_eboot(dynarmic_tests dynarmic_tests IV0000-BREW00090_00-DYNARMICTS000000)
endif() endif()
src/tests/CMakeLists.txt
+1 -1
View File
@@ -38,7 +38,7 @@ if (NOT MSVC)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>) $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
endif() endif()
if (PLATFORM_PS4) if (OPENORBIS)
target_link_libraries(tests PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService ps4sup) target_link_libraries(tests PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService ps4sup)
create_ps4_eboot(tests tests IV0000-BREW00090_00-DYNARMICTS000000) create_ps4_eboot(tests tests IV0000-BREW00090_00-DYNARMICTS000000)
endif() endif()
src/yuzu_cmd/CMakeLists.txt
+5 -3
View File
@@ -76,8 +76,10 @@ if (NOT MSVC)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>) $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
endif() endif()
if (PLATFORM_PS4) if (OPENORBIS)
target_link_libraries(yuzu-cmd PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService) target_link_libraries(yuzu-cmd
target_link_libraries(yuzu-cmd PRIVATE ps4sup) PRIVATE OSMesa
PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService
PRIVATE ps4sup)
create_ps4_eboot(yuzu-cmd eden-cli IV0000-BREW00090_00-EDENEMULAT000000) create_ps4_eboot(yuzu-cmd eden-cli IV0000-BREW00090_00-EDENEMULAT000000)
endif() endif()