diff options
| author | crueter <crueter@eden-emu.dev> | 2025-09-23 19:38:11 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-09-23 19:38:11 +0200 |
| commit | 76a8a6e03926e7bcc6111f92b894fdae4d0a17ea (patch) | |
| tree | 9db20525e93f623d2741749757f88317fee9980d /externals/CMakeLists.txt | |
| parent | 49ddf95c709b9a322f4b2c1d0068c8365a558783 (diff) | |
[cmake] feat: FFmpeg CI, allow 16kb android builds, update translations for transifex (#2543)
Uses an FFmpeg CI for Android and Windows, also available for Linux. Saves compile time on Linux and is more consistent on Windows/Android.
Also, updates VVL and FFmpeg to allow for a fully 16kb-compliant Android build. Bonus: APK size is down 30%
Updated all localization files for Transifex while I was at it
TODO for future: Android 8.0 with vp9_vulkan et al.
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2543
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'externals/CMakeLists.txt')
| -rw-r--r-- | externals/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index ce1450e241..754ba61a0b 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -25,10 +25,6 @@ set(BUILD_SHARED_LIBS OFF) # Skip install rules for all externals set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) -if (FORCE_DOWNLOAD_WIN_BUNDLES) - download_win_archives() -endif() - # Xbyak (also used by Dynarmic, so needs to be added first) if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) if (PLATFORM_SUN OR PLATFORM_OPENBSD) @@ -97,12 +93,16 @@ endif() AddJsonPackage(unordered-dense) # FFMpeg -if (YUZU_USE_BUNDLED_FFMPEG) +if (YUZU_USE_EXTERNAL_FFMPEG OR YUZU_USE_BUNDLED_FFMPEG) add_subdirectory(ffmpeg) + set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE) set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE) set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE) + set(FFmpeg_LIBRARY_DIR "${FFmpeg_LIBRARY_DIR}" PARENT_SCOPE) set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) + + message(STATUS "FFmpeg Libraries: ${FFmpeg_LIBRARIES}") endif() # TZDB (Time Zone Database) |