diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-02-06 03:14:11 -0500 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-02-06 03:17:36 -0500 |
| commit | 527188391c825836c91bd26c4b953999eb8f2dde (patch) | |
| tree | 235d2f5f4b237faa57ec80217d36a2806e135eee /externals | |
| parent | 8b54e219c9dcdcb144c883494bba6e3a88dffb72 (diff) | |
CMakeLists: Use bundled FFmpeg as a fallback
Sets YUZU_USE_BUNDLED_FFMPEG as a CMake dependent option that is OFF on
Linux and ON for WIN32 targets. If FFmpeg is not found when
YUZU_USE_BUNDLED_FFMPEG is OFF, the bundled module/binaries are used
instead.
Reverts earlier changes to FindFFmpeg a bit, mostly to keep parity with
it's Citra version a bit. Now _FFmpeg_ALL_COMPONENTS lists all
components. We overwrite FFmpeg_LIBRARIES and FFmpeg_INCLUDE_DIR after
using the module.
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/find-modules/FindFFmpeg.cmake | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/externals/find-modules/FindFFmpeg.cmake b/externals/find-modules/FindFFmpeg.cmake index 86a3f5a5a..61b6dc8d2 100644 --- a/externals/find-modules/FindFFmpeg.cmake +++ b/externals/find-modules/FindFFmpeg.cmake @@ -22,19 +22,24 @@ # # <component> can be one of: # avcodec -# avdevice # Disabled -# avfilter # Disabled -# avformat # Disabled +# avdevice +# avfilter +# avformat # avutil -# postproc # Disabled -# swresample # Disabled +# postproc +# swresample # swscale # set(_FFmpeg_ALL_COMPONENTS - avcodec - avutil - swscale + avcodec + avdevice + avfilter + avformat + avutil + postproc + swresample + swscale ) set(_FFmpeg_DEPS_avcodec avutil) |