summaryrefslogtreecommitdiff
path: root/.ci/scripts/linux
diff options
context:
space:
mode:
authorGravatar lat9nq2021-07-06 12:06:14 -0400
committerGravatar lat9nq2021-07-06 12:28:22 -0400
commitfbb26e6173aee296bdfb6083c553d843ece58ccc (patch)
tree139fa8a19508a2abc2e36974dd5ef03ea6028598 /.ci/scripts/linux
parentMerge pull request #6561 from german77/analog_fix (diff)
downloadyuzu-fbb26e6173aee296bdfb6083c553d843ece58ccc.tar.gz
yuzu-fbb26e6173aee296bdfb6083c553d843ece58ccc.tar.xz
yuzu-fbb26e6173aee296bdfb6083c553d843ece58ccc.zip
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')
-rwxr-xr-x.ci/scripts/linux/docker.sh3
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 .. \
18 -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ 18 -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
19 -DENABLE_QT_TRANSLATION=ON \ 19 -DENABLE_QT_TRANSLATION=ON \
20 -DUSE_DISCORD_PRESENCE=ON \ 20 -DUSE_DISCORD_PRESENCE=ON \
21 -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} 21 -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
22 -DYUZU_USE_BUNDLED_FFMPEG=ON
22 23
23make -j$(nproc) 24make -j$(nproc)
24 25