Browse Source
[cmake] fix android and source pack
Signed-off-by: crueter <crueter@crueter.xyz>
pull/392/head
crueter
6 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with
4 additions and
4 deletions
-
src/android/app/src/main/jni/CMakeLists.txt
-
tools/cpm-fetch.sh
|
|
@ -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) |
|
|
|
|
|
@ -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") |
|
|
|
|
|
|
|
|
|
