VERY experimental Nintendo Switch 2 emulator
C++
android: Switch to custom Oboe submodule
Briardd32efa3d8a6
diff --git a/.gitmodules b/.gitmodulesindex 1c84070fc0..976106865c 100644--- a/.gitmodules+++ b/.gitmodules@@ -67,3 +67,6 @@[submodule "Vulkan-Utility-Libraries"]path = externals/Vulkan-Utility-Librariesurl = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git+[submodule "oboe"]+ path = externals/oboe+ url = https://github.com/eden-emulator/oboe.gitdiff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 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/oboenew file mode 160000index 0000000000..17ab1e4f41--- /dev/null+++ b/externals/oboe@@ -0,0 +1 @@+Subproject commit 17ab1e4f41e5028b344a79984ee3eb7b071f4167diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txtindex 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 PRIVATEsink/oboe_sink.cppsink/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.jsonindex 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": [