Browse Source

Fix android comp

Signed-off-by: crueter <crueter@eden-emu.dev>
ucrt
crueter 1 week ago
parent
commit
cf35c7b929
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 4
      externals/ffmpeg/CMakeLists.txt
  2. 2
      src/android/app/build.gradle.kts
  3. 2
      src/android/app/src/main/jni/CMakeLists.txt

4
externals/ffmpeg/CMakeLists.txt

@ -59,7 +59,7 @@ endif()
if (PLATFORM_PS4 OR PLATFORM_MANAGARM) if (PLATFORM_PS4 OR PLATFORM_MANAGARM)
# Doesn't support VA-API, don't go thru the embarrassment of trying to enable it # Doesn't support VA-API, don't go thru the embarrassment of trying to enable it
list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi) 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) find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBVA libva) pkg_check_modules(LIBVA libva)
pkg_check_modules(CUDA cuda) pkg_check_modules(CUDA cuda)
@ -169,7 +169,7 @@ if (PLATFORM_PS4)
) )
elseif (PLATFORM_MANAGARM) elseif (PLATFORM_MANAGARM)
# Required for proper stuff # Required for proper stuff
list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
--disable-pthreads --disable-pthreads
--extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}" --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
) )

2
src/android/app/build.gradle.kts

@ -256,7 +256,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version = "3.22.1"
version = "3.31.6"
path = file("${edenDir}/CMakeLists.txt") path = file("${edenDir}/CMakeLists.txt")
} }
} }

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

@ -33,3 +33,5 @@ if (ENABLE_UPDATE_CHECKER)
endif() endif()
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android)
target_link_options(yuzu-android PRIVATE "-Wl,-Bsymbolic")
Loading…
Cancel
Save