aboutsummaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorAmeer J <52414509+ameerj@users.noreply.github.com>2021-08-01 01:34:10 -0400
committerGitHub <noreply@github.com>2021-08-01 01:34:10 -0400
commita086ee6a0021b0d9cb5a4a1fb609220f4114fb97 (patch)
tree5d8e650db36e62fe64099964e6ead564855982f4 /.ci
parent7cf0958b062d2cd264af1f6420d19d320574b021 (diff)
parentef70054367c1162df2634b9f462011c15614f191 (diff)
Merge pull request #6565 from lat9nq/bundle-ffmpeg
cmake, ci: Build bundled FFmpeg with yuzu
Diffstat (limited to '.ci')
-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 .. \
-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)