Browse Source

FIX FOR DETECT PLATFORM

eden-orbis-ps4
lizzie 21 hours ago
parent
commit
7b82cd266f
  1. 4
      .patch/sdl3/0001-ps4.patch
  2. 2
      .patch/sdl3/0002-ps4-drivers.patch
  3. 2
      externals/CMakeLists.txt
  4. 2
      src/audio_core/CMakeLists.txt
  5. 2
      src/dynarmic/tests/CMakeLists.txt
  6. 2
      src/tests/CMakeLists.txt
  7. 8
      src/yuzu_cmd/CMakeLists.txt

4
.patch/sdl3/0001-ps4.patch

@ -15,7 +15,7 @@ index 8872895..b0eeca8 100644
endif()
+# Always on?
+if (PLATFORM_PS4)
+if (OPENORBIS)
+ sdl_sources(
+ "${SDL3_SOURCE_DIR}/src/thread/pthread/SDL_systhread.c"
+ "${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)
# The Emscripten and N-Gage platform has been carefully vetted to work without threads
- if(EMSCRIPTEN OR NGAGE)
+ if(EMSCRIPTEN OR NGAGE OR PLATFORM_PS4)
+ if(EMSCRIPTEN OR NGAGE OR OPENORBIS)
set(SDL_THREADS_DISABLED 1)
sdl_glob_sources(
"${SDL3_SOURCE_DIR}/src/thread/generic/*.c"

2
.patch/sdl3/0002-ps4-drivers.patch

@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0eeca8..076cbe4 100644
--- a/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_systls.c"
"${SDL3_SOURCE_DIR}/src/thread/generic/SDL_syssem.c"

2
externals/CMakeLists.txt

@ -260,7 +260,7 @@ target_include_directories(tz PUBLIC ./tz)
add_library(bc_decoder bc_decoder/bc_decoder.cpp)
target_include_directories(bc_decoder PUBLIC ./bc_decoder)
if (PLATFORM_PS4)
if (OPENORBIS)
add_library(ps4sup ps4sup/emutls.c ps4sup/stub.cpp)
target_include_directories(ps4sup PUBLIC ./ps4sup)
endif()

2
src/audio_core/CMakeLists.txt

@ -254,7 +254,7 @@ else()
target_compile_definitions(audio_core PRIVATE HAVE_SDL3)
endif()
if(PLATFORM_PS4)
if(OPENORBIS)
target_sources(audio_core PRIVATE
sink/ps4_sink.cpp
sink/ps4_sink.h)

2
src/dynarmic/tests/CMakeLists.txt

@ -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)
if (PLATFORM_PS4)
if (OPENORBIS)
target_link_libraries(dynarmic_tests PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService ps4sup)
create_ps4_eboot(dynarmic_tests dynarmic_tests IV0000-BREW00090_00-DYNARMICTS000000)
endif()

2
src/tests/CMakeLists.txt

@ -38,7 +38,7 @@ if (NOT MSVC)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
endif()
if (PLATFORM_PS4)
if (OPENORBIS)
target_link_libraries(tests PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService ps4sup)
create_ps4_eboot(tests tests IV0000-BREW00090_00-DYNARMICTS000000)
endif()

8
src/yuzu_cmd/CMakeLists.txt

@ -76,8 +76,10 @@ if (NOT MSVC)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>)
endif()
if (PLATFORM_PS4)
target_link_libraries(yuzu-cmd PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService)
target_link_libraries(yuzu-cmd PRIVATE ps4sup)
if (OPENORBIS)
target_link_libraries(yuzu-cmd
PRIVATE OSMesa
PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService
PRIVATE ps4sup)
create_ps4_eboot(yuzu-cmd eden-cli IV0000-BREW00090_00-EDENEMULAT000000)
endif()
Loading…
Cancel
Save