diff options
| -rw-r--r-- | CMakeModules/DownloadExternals.cmake | 2 | ||||
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 814069f0b..2e5964cbe 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake | |||
| @@ -19,7 +19,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | |||
| 19 | elseif (ANDROID) | 19 | elseif (ANDROID) |
| 20 | set(package_base_url "https://gitlab.com/tertius42/") | 20 | set(package_base_url "https://gitlab.com/tertius42/") |
| 21 | set(package_repo "ext-android-bin/-/raw/main/") | 21 | set(package_repo "ext-android-bin/-/raw/main/") |
| 22 | set(package_extension ".tar.xz") #ffmpeg/ffmpeg-android-20221229.tar.xz") | 22 | set(package_extension ".tar.xz") |
| 23 | else() | 23 | else() |
| 24 | message(FATAL_ERROR "No package available for this platform") | 24 | message(FATAL_ERROR "No package available for this platform") |
| 25 | endif() | 25 | endif() |
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 093616629..0a926e399 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt | |||
| @@ -223,7 +223,13 @@ if (NOT WIN32 AND NOT ANDROID) | |||
| 223 | endif() | 223 | endif() |
| 224 | elseif(ANDROID) | 224 | elseif(ANDROID) |
| 225 | # Use yuzu FFmpeg binaries | 225 | # Use yuzu FFmpeg binaries |
| 226 | set(FFmpeg_EXT_NAME "ffmpeg-android-v4.4.LTS") | 226 | if (ARCHITECTURE_arm64) |
| 227 | set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-aarch64") | ||
| 228 | elseif (ARCHITECTURE_x86_64) | ||
| 229 | set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-x86_64") | ||
| 230 | else() | ||
| 231 | message(FATAL_ERROR "Unsupported architecture for Android FFmpeg") | ||
| 232 | endif() | ||
| 227 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") | 233 | set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
| 228 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") | 234 | download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
| 229 | set(FFmpeg_FOUND YES) | 235 | set(FFmpeg_FOUND YES) |