eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 57 Projects 1 Releases Packages Wiki Activity Actions

[cmake] fix android and source pack
All checks were successful
eden-license / license-header (pull_request) Successful in 39s
Details

Browse source 
Signed-off-by: crueter <crueter@crueter.xyz>
This commit is contained in:
crueter 2025-09-07 21:12:19 -04:00
parent 108ef24cca
commit ecd6bf68d1
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/android/app/src/main/jni/CMakeLists.txt
View file

@ -17,7 +17,7 @@ add_library(yuzu-android SHARED
set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR}) 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) target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log)
if (ARCHITECTURE_arm64) if (ARCHITECTURE_arm64)
target_link_libraries(yuzu-android PRIVATE adrenotools) target_link_libraries(yuzu-android PRIVATE adrenotools)

6
tools/cpm-fetch.sh
View file

@ -122,9 +122,9 @@ do
URL=$(jq -r ".url" <<< "$JSON") URL=$(jq -r ".url" <<< "$JSON")
REPO=$(jq -r ".repo" <<< "$JSON") REPO=$(jq -r ".repo" <<< "$JSON")
SHA=$(jq -r ".sha" <<< "$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") VERSION=$(jq -r ".version" <<< "$JSON")
GIT_VERSION=$(jq -r ".git_version" <<< "$JSON") GIT_VERSION=$(jq -r ".git_version" <<< "$JSON")
@ -146,7 +146,7 @@ do
if [ "$URL" != "null" ]; then if [ "$URL" != "null" ]; then
DOWNLOAD="$URL" DOWNLOAD="$URL"
elif [ "$REPO" != "null" ]; then elif [ "$REPO" != "null" ]; then
GIT_URL="https://$GIT_URL/$REPO" GIT_URL="https://$GIT_HOST/$REPO"
BRANCH=$(jq -r ".branch" <<< "$JSON") BRANCH=$(jq -r ".branch" <<< "$JSON")