Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMakeLists: Use bundled FFmpeg as a fallback

Browse source 
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.
This commit is contained in:
lat9nq 2021-02-06 03:14:11 -05:00
parent 8b54e219c9
commit 527188391c
2 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
externals/find-modules/FindFFmpeg.cmake vendored
View file

@ -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)