diff options
| author | crueter <crueter@eden-emu.dev> | 2026-09-02 00:29:58 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-09-02 00:29:58 +0200 |
| commit | aa4e494c08075f5d048e8e3d6e0f7426d88d0f0a (patch) | |
| tree | 3055c96bf4c84efcc24f768acc4545c1147f5c2d /CMakeLists.txt | |
| parent | 858f9e5aeac89503c331dfe4588cc3c83ab2223b (diff) | |
[android] Replace Oboe audio with SDL3 audio (#4338)
Supersedes #4335.
Replaces the Oboe audio backend with SDL3, since we already support it.
A few caveats:
- SDL defines a JVM OnLoad method already, so we have to instead hijack
NativeLibrary for id_cache initialization
- This also means some internal fields in Double/Integer/Boolean (namely
`value`) can't be accessed, so I switched those to methods for now.
- SDL Java sources are pulled in from the CI package.
- Since we can't use SDLActivity, `SDL.setupJNI()` handles everything
Signed-off-by: crueter <crueter@eden-emu.dev>
- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions).
- [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md)
- [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability.
-------------------
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4338
Reviewed-by: Lizzie and Samuel <lizzie@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 477e7c636d..bc4b991b4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,8 +214,6 @@ if(MSVC) endif() # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system -cmake_dependent_option(YUZU_USE_BUNDLED_SDL3 "Download bundled SDL3 build" "${MSVC}" "NOT ANDROID" OFF) - option(ENABLE_CUBEB "Enables the cubeb audio backend" ON) set(EXT_DEFAULT OFF) @@ -223,6 +221,8 @@ if (MSVC OR ANDROID) set(EXT_DEFAULT ON) endif() +option(YUZU_USE_BUNDLED_SDL3 "Download bundled SDL3 build" ${EXT_DEFAULT}) + # ffmpeg option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT}) cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external source" "${SOLARIS}" "NOT WIN32 AND NOT ANDROID" OFF) |