diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-07-06 12:06:14 -0400 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-07-06 12:28:22 -0400 |
| commit | fbb26e6173aee296bdfb6083c553d843ece58ccc (patch) | |
| tree | 139fa8a19508a2abc2e36974dd5ef03ea6028598 /.ci/scripts/linux/docker.sh | |
| parent | 942c0d6cdd7975ded7435917ce24fdbaa4b8077d (diff) | |
cmake, ci: Build bundled FFmpeg with yuzu
Drops usage of CMAKE_DEPENDENT_OPTION to allow using
YUZU_USE_BUNDLED_FFMPEG as an option on any platform. CI then now builds
FFmpeg always, netting about 10 MB less used on the AppImage.
Also somewhat fixes YUZU_USE_BUNDLED_QT so that it can be used even if
CMake doesn't clean up its state after running the first find_package.
Diffstat (limited to '.ci/scripts/linux/docker.sh')
| -rwxr-xr-x | .ci/scripts/linux/docker.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 9b451d3ab..5070b92d1 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -18,7 +18,8 @@ cmake .. \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_DISCORD_PRESENCE=ON \ - -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} + -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \ + -DYUZU_USE_BUNDLED_FFMPEG=ON make -j$(nproc) |