diff options
Diffstat (limited to 'externals/CMakeLists.txt')
-rw-r--r-- | externals/CMakeLists.txt | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 26ead64f2..158113516 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -52,11 +52,12 @@ endif() # SDL2 if (YUZU_USE_EXTERNAL_SDL2) if (NOT WIN32) - # Yuzu itself needs: Events Joystick Haptic Sensor Timers Audio + # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers + # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095) # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) set(SDL_UNUSED_SUBSYSTEMS - Atomic Render Power Threads - File CPUinfo Filesystem Locale) + CPUinfo File Filesystem + Locale Power Render) foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) string(TOUPPER ${_SUB} _OPT) option(SDL_${_OPT} "" OFF) @@ -121,3 +122,12 @@ if (YUZU_USE_BUNDLED_OPUS) else() find_package(opus 1.3 REQUIRED) endif() + +# FFMpeg +if (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_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) +endif() |