diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/android/app/build.gradle | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bcd88784b..2d25cc3a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -108,6 +108,9 @@ if (YUZU_USE_BUNDLED_VCPKG) | |||
| 108 | if (ANDROID) | 108 | if (ANDROID) |
| 109 | set(VCPKG_TARGET_TRIPLET "arm64-android") | 109 | set(VCPKG_TARGET_TRIPLET "arm64-android") |
| 110 | set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}") | 110 | set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}") |
| 111 | # this is to avoid CMake using the host pkg-config to find the host | ||
| 112 | # libraries when building for Android targets | ||
| 113 | set(PKG_CONFIG_EXECUTABLE "aarch64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE) | ||
| 111 | list(APPEND VCPKG_MANIFEST_FEATURES "android") | 114 | list(APPEND VCPKG_MANIFEST_FEATURES "android") |
| 112 | endif() | 115 | endif() |
| 113 | 116 | ||
diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle index c9dc173ca..06f30b1d4 100644 --- a/src/android/app/build.gradle +++ b/src/android/app/build.gradle | |||
| @@ -101,6 +101,7 @@ android { | |||
| 101 | arguments "-DENABLE_QT=0", // Don't use QT | 101 | arguments "-DENABLE_QT=0", // Don't use QT |
| 102 | "-DENABLE_SDL2=0", // Don't use SDL | 102 | "-DENABLE_SDL2=0", // Don't use SDL |
| 103 | "-DENABLE_WEB_SERVICE=0", // Don't use telemetry | 103 | "-DENABLE_WEB_SERVICE=0", // Don't use telemetry |
| 104 | "-DBUNDLE_SPEEX=ON", | ||
| 104 | "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work | 105 | "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work |
| 105 | "-DYUZU_USE_BUNDLED_VCPKG=ON", | 106 | "-DYUZU_USE_BUNDLED_VCPKG=ON", |
| 106 | "-DYUZU_USE_BUNDLED_FFMPEG=ON" | 107 | "-DYUZU_USE_BUNDLED_FFMPEG=ON" |