diff --git a/android/app/build.gradle b/android/app/build.gradle index 09855867dc..0ec8c16d5f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -60,6 +60,6 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.16.0' implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'androidx.games:games-activity:4.0.0' + implementation 'androidx.games:games-activity:1.2.1' implementation 'com.google.android.material:material:1.12.0' } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e7bac59979..925bbcd004 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -463,6 +463,9 @@ if(MSVC) log_option_enabled("STATIC_LIBRARY") set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") find_package(Vorbis REQUIRED) + if(ANDROID) + find_package(Vorbis CONFIG REQUIRED) + endif() set_property(TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "") else() @@ -550,6 +553,8 @@ elseif(ANDROID) Threads::Threads asio::asio OpenSLES + Vorbis::vorbis + Vorbis::vorbisfile LibLZMA::LibLZMA game-activity::game-activity GLESv3 diff --git a/src/framework/platform/androidgameactivity.cpp b/src/framework/platform/androidgameactivity.cpp index 394df40208..7f60ca7460 100644 --- a/src/framework/platform/androidgameactivity.cpp +++ b/src/framework/platform/androidgameactivity.cpp @@ -1,9 +1,9 @@ #ifdef ANDROID -#include -#include +#include +#include extern "C" { - #include + #include } #endif