diff options
| author | GPUCode <geoster3d@gmail.com> | 2023-09-08 21:43:54 +0200 |
|---|---|---|
| committer | GPUCode <geoster3d@gmail.com> | 2023-09-08 22:13:52 +0200 |
| commit | 254b2bd9dfb71e7754b6f923735afbf97b01f2da (patch) | |
| tree | e6c03648b0adfa0eed6dc7470366da7c61637485 | |
| parent | Merge pull request #11420 from t895/long-install-fix (diff) | |
| download | yuzu-254b2bd9dfb71e7754b6f923735afbf97b01f2da.tar yuzu-254b2bd9dfb71e7754b6f923735afbf97b01f2da.tar.gz yuzu-254b2bd9dfb71e7754b6f923735afbf97b01f2da.tar.bz2 yuzu-254b2bd9dfb71e7754b6f923735afbf97b01f2da.tar.lz yuzu-254b2bd9dfb71e7754b6f923735afbf97b01f2da.tar.xz yuzu-254b2bd9dfb71e7754b6f923735afbf97b01f2da.tar.zst yuzu-254b2bd9dfb71e7754b6f923735afbf97b01f2da.zip | |
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4039c680e..c6b158985 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,8 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}") option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) +option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON) + CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF) CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF) @@ -77,6 +79,24 @@ if (ANDROID OR WIN32 OR APPLE) endif() option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL}) +if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL) + set(vvl_version "sdk-1.3.261.1") + set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip") + if (NOT EXISTS "${vvl_zip_file}") + # Download and extract validation layer release to externals directory + set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download") + file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-${vvl_version}-android.zip" + "${vvl_zip_file}" SHOW_PROGRESS) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals") + endif() + + # Copy the arm64 binary to src/android/app/main/jniLibs + set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/") + file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so" + DESTINATION "${vvl_lib_path}") +endif() + # On Android, fetch and compile libcxx before doing anything else if (ANDROID) set(CMAKE_SKIP_INSTALL_RULES ON) |