From 19eec22b38d37711951ea7549a6ea77c449a81a2 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Sat, 4 Mar 2023 00:05:17 -0700 Subject: CMake: fix pkg-config behavior when building for Android --- CMakeLists.txt | 3 +++ src/android/app/build.gradle | 1 + 2 files changed, 4 insertions(+) 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) if (ANDROID) set(VCPKG_TARGET_TRIPLET "arm64-android") set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}") + # this is to avoid CMake using the host pkg-config to find the host + # libraries when building for Android targets + set(PKG_CONFIG_EXECUTABLE "aarch64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE) list(APPEND VCPKG_MANIFEST_FEATURES "android") endif() 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 { arguments "-DENABLE_QT=0", // Don't use QT "-DENABLE_SDL2=0", // Don't use SDL "-DENABLE_WEB_SERVICE=0", // Don't use telemetry + "-DBUNDLE_SPEEX=ON", "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work "-DYUZU_USE_BUNDLED_VCPKG=ON", "-DYUZU_USE_BUNDLED_FFMPEG=ON" -- cgit v1.2.3