Browse Source
Fix android comp
Signed-off-by: crueter <crueter@eden-emu.dev>
ucrt
crueter
1 week ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
5 additions and
3 deletions
-
externals/ffmpeg/CMakeLists.txt
-
src/android/app/build.gradle.kts
-
src/android/app/src/main/jni/CMakeLists.txt
|
|
|
@ -59,7 +59,7 @@ endif() |
|
|
|
if (PLATFORM_PS4 OR PLATFORM_MANAGARM) |
|
|
|
# Doesn't support VA-API, don't go thru the embarrassment of trying to enable it |
|
|
|
list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi) |
|
|
|
elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING) |
|
|
|
elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING AND NOT ANDROID) |
|
|
|
find_package(PkgConfig REQUIRED) |
|
|
|
pkg_check_modules(LIBVA libva) |
|
|
|
pkg_check_modules(CUDA cuda) |
|
|
|
@ -169,7 +169,7 @@ if (PLATFORM_PS4) |
|
|
|
) |
|
|
|
elseif (PLATFORM_MANAGARM) |
|
|
|
# Required for proper stuff |
|
|
|
list(APPEND FFmpeg_CROSS_COMPILE_FLAGS |
|
|
|
list(APPEND FFmpeg_CROSS_COMPILE_FLAGS |
|
|
|
--disable-pthreads |
|
|
|
--extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}" |
|
|
|
) |
|
|
|
|
|
|
|
@ -256,7 +256,7 @@ android { |
|
|
|
|
|
|
|
externalNativeBuild { |
|
|
|
cmake { |
|
|
|
version = "3.22.1" |
|
|
|
version = "3.31.6" |
|
|
|
path = file("${edenDir}/CMakeLists.txt") |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -33,3 +33,5 @@ if (ENABLE_UPDATE_CHECKER) |
|
|
|
endif() |
|
|
|
|
|
|
|
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android) |
|
|
|
|
|
|
|
target_link_options(yuzu-android PRIVATE "-Wl,-Bsymbolic") |
