From ecd6bf68d12ab6b63e8da2c8966126a52985f3fa Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 7 Sep 2025 21:12:19 -0400 Subject: [PATCH] [cmake] fix android and source pack Signed-off-by: crueter --- src/android/app/src/main/jni/CMakeLists.txt | 2 +- tools/cpm-fetch.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index 9dbee1fcef..9ad00d26ee 100644 --- a/src/android/app/src/main/jni/CMakeLists.txt +++ b/src/android/app/src/main/jni/CMakeLists.txt @@ -17,7 +17,7 @@ add_library(yuzu-android SHARED set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR}) -target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common Vulkan::Headers GPUOpen::VulkanMemoryAllocator) +target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common video_core) target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log) if (ARCHITECTURE_arm64) target_link_libraries(yuzu-android PRIVATE adrenotools) diff --git a/tools/cpm-fetch.sh b/tools/cpm-fetch.sh index f9614b1904..733ba5c1a8 100755 --- a/tools/cpm-fetch.sh +++ b/tools/cpm-fetch.sh @@ -122,9 +122,9 @@ do URL=$(jq -r ".url" <<< "$JSON") REPO=$(jq -r ".repo" <<< "$JSON") SHA=$(jq -r ".sha" <<< "$JSON") - GIT_URL=$(jq -r ".git_url" <<< "$JSON") + GIT_HOST=$(jq -r ".git_host" <<< "$JSON") - [ "$GIT_URL" == null ] && GIT_URL=github.com + [ "$GIT_HOST" == null ] && GIT_HOST=github.com VERSION=$(jq -r ".version" <<< "$JSON") GIT_VERSION=$(jq -r ".git_version" <<< "$JSON") @@ -146,7 +146,7 @@ do if [ "$URL" != "null" ]; then DOWNLOAD="$URL" elif [ "$REPO" != "null" ]; then - GIT_URL="https://$GIT_URL/$REPO" + GIT_URL="https://$GIT_HOST/$REPO" BRANCH=$(jq -r ".branch" <<< "$JSON")