diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-11-04 01:54:53 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-11-04 02:22:05 +0100 |
| commit | fc6db97a09e2de5eff10131ddcab9cf8fb2f736c (patch) | |
| tree | 32a7b408286eb84360bcaff2961dbaa874f5a5d3 /.travis/linux | |
| parent | Merge pull request #4887 from lioncash/common-build (diff) | |
| download | yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.gz yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.bz2 yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.lz yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.xz yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.zst yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.zip | |
Diffstat (limited to '')
| -rwxr-xr-x | .travis/linux-mingw/docker.sh | 10 | ||||
| -rwxr-xr-x | .travis/linux/docker.sh | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/.travis/linux-mingw/docker.sh b/.travis/linux-mingw/docker.sh index 28033acfb..80d7dfe9b 100755 --- a/.travis/linux-mingw/docker.sh +++ b/.travis/linux-mingw/docker.sh @@ -4,16 +4,8 @@ cd /yuzu # override Travis CI unreasonable ccache size echo 'max_size = 3.0G' > "$HOME/.ccache/ccache.conf" -# Dirty hack to trick unicorn makefile into believing we are in a MINGW system -mv /bin/uname /bin/uname1 && echo -e '#!/bin/sh\necho MINGW64' >> /bin/uname -chmod +x /bin/uname - -# Dirty hack to trick unicorn makefile into believing we have cmd -echo '' >> /bin/cmd -chmod +x /bin/cmd - mkdir build && cd build -cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release +cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release ninja # Clean up the dirty hacks diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index 3a9970384..166fb6d4c 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh @@ -3,7 +3,7 @@ cd /yuzu mkdir build && cd build -cmake .. -G Ninja -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=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 +cmake .. -G Ninja -DYUZU_USE_QT_WEB_ENGINE=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 ninja ccache -s |