diff options
| author | Briar <205427297+icybriarr@users.noreply.github.com> | 2025-04-02 06:03:08 +0200 |
|---|---|---|
| committer | Briar <205427297+icybriarr@users.noreply.github.com> | 2025-04-04 03:23:32 +0200 |
| commit | dd32efa3d8a63755779af308f1e6d290e793e515 (patch) | |
| tree | bf642e65a39b3176c64124c88c9ede434ce65df6 | |
| parent | 9cbd5bd299ba6b7adb1231d513e3f8b9032ab94f (diff) | |
android: Switch to custom Oboe submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 6 | ||||
| m--------- | externals/oboe | 0 | ||||
| -rw-r--r-- | src/audio_core/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | vcpkg.json | 9 |
5 files changed, 12 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules index 1c84070fc0..976106865c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,3 +67,6 @@ [submodule "Vulkan-Utility-Libraries"] path = externals/Vulkan-Utility-Libraries url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git +[submodule "oboe"] + path = externals/oboe + url = https://github.com/eden-emulator/oboe.git diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d49a2e43e9..290384c570 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -314,3 +314,9 @@ endif() if (NOT TARGET SimpleIni::SimpleIni) add_subdirectory(simpleini) endif() + +# oboe +if (ANDROID) + add_subdirectory(oboe) + add_library(oboe::oboe ALIAS oboe) +endif() diff --git a/externals/oboe b/externals/oboe new file mode 160000 +Subproject 17ab1e4f41e5028b344a79984ee3eb7b071f416 diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index 4e4ed1789f..8c94109de0 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -251,15 +251,13 @@ if (ENABLE_SDL2) target_compile_definitions(audio_core PRIVATE HAVE_SDL2) endif() -if (ANDROID) +if(ANDROID) target_sources(audio_core PRIVATE sink/oboe_sink.cpp sink/oboe_sink.h ) - - # FIXME: this port seems broken, it cannot be imported with find_package(oboe REQUIRED) - target_link_libraries(audio_core PRIVATE "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/liboboe.a") - target_compile_definitions(audio_core PRIVATE HAVE_OBOE) + target_link_libraries(audio_core PRIVATE oboe) + target_compile_definitions(audio_core PUBLIC HAVE_OBOE) endif() if (YUZU_USE_PRECOMPILED_HEADERS) diff --git a/vcpkg.json b/vcpkg.json index cbac9db200..418026db62 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -41,15 +41,6 @@ "platform": "windows" } ] - }, - "android": { - "description": "Enable Android dependencies", - "dependencies": [ - { - "name": "oboe", - "platform": "android" - } - ] } }, "overrides": [ |