diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-06 02:43:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 02:43:09 -0400 |
| commit | b8b90ce6e61329ebda226b9917ed961be3b80d1f (patch) | |
| tree | 8e6b82419db7fb24eb5d8f06346a0a1228f9513c /.travis/linux | |
| parent | 095c8d999b27bcd412ab91da27c56d014d8ddeb9 (diff) | |
| parent | e4daf4bee522c046e5e01eeed2c5b12bd91f489e (diff) | |
Merge pull request #1332 from FearlessTobi/port-web-backend
Port web_service from Citra
Diffstat (limited to '.travis/linux')
| -rwxr-xr-x | .travis/linux/build.sh | 2 | ||||
| -rwxr-xr-x | .travis/linux/docker.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh index c3a1f93e4..2fced727d 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -ex mkdir -p "$HOME/.ccache" -docker run --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh +docker run -e ENABLE_COMPATIBILITY_REPORTING --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache ubuntu:18.04 /bin/bash /yuzu/.travis/linux/docker.sh diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index 892d2480a..4fe3326f9 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh @@ -6,7 +6,7 @@ apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev cd /yuzu mkdir build && cd build -cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -G Ninja +cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -G Ninja ninja ccache -s |