diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d25cc3a9..1771b063c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -106,12 +106,20 @@ endif() | |||
| 106 | 106 | ||
| 107 | if (YUZU_USE_BUNDLED_VCPKG) | 107 | if (YUZU_USE_BUNDLED_VCPKG) |
| 108 | if (ANDROID) | 108 | if (ANDROID) |
| 109 | set(VCPKG_TARGET_TRIPLET "arm64-android") | ||
| 110 | set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}") | 109 | 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) | ||
| 114 | list(APPEND VCPKG_MANIFEST_FEATURES "android") | 110 | list(APPEND VCPKG_MANIFEST_FEATURES "android") |
| 111 | |||
| 112 | if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") | ||
| 113 | set(VCPKG_TARGET_TRIPLET "arm64-android") | ||
| 114 | # this is to avoid CMake using the host pkg-config to find the host | ||
| 115 | # libraries when building for Android targets | ||
| 116 | set(PKG_CONFIG_EXECUTABLE "aarch64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE) | ||
| 117 | elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64") | ||
| 118 | set(VCPKG_TARGET_TRIPLET "x64-android") | ||
| 119 | set(PKG_CONFIG_EXECUTABLE "x86_64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE) | ||
| 120 | else() | ||
| 121 | message(FATAL_ERROR "Unsupported Android architecture ${CMAKE_ANDROID_ARCH_ABI}") | ||
| 122 | endif() | ||
| 115 | endif() | 123 | endif() |
| 116 | 124 | ||
| 117 | if (YUZU_TESTS) | 125 | if (YUZU_TESTS) |