diff options
| author |  bunnei | 2018-06-07 11:45:50 -0400 |
|---|---|---|
| committer |  GitHub | 2018-06-07 11:45:50 -0400 |
| commit | 5aff2d38a940892ce93a813e8de5100f919956d2 (patch) | |
| tree | d205646d54565a7659e1f2586bce677fbe0ee0d4 | |
| parent | Merge pull request #543 from Subv/uniforms (diff) | |
| parent | Use Ninja for Travis builds (diff) | |
| download | yuzu-5aff2d38a940892ce93a813e8de5100f919956d2.tar.gz yuzu-5aff2d38a940892ce93a813e8de5100f919956d2.tar.xz yuzu-5aff2d38a940892ce93a813e8de5100f919956d2.zip | |
Merge pull request #478 from janisozaur/patch-1
Use Ninja for Travis builds
| -rwxr-xr-x | .travis/linux/docker.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index 8a23b54b1..bc541216c 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/bash -ex | 1 | #!/bin/bash -ex |
| 2 | 2 | ||
| 3 | apt-get update | 3 | apt-get update |
| 4 | apt-get install -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget | 4 | apt-get install -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget ninja-build |
| 5 | 5 | ||
| 6 | # Get a recent version of CMake | 6 | # Get a recent version of CMake |
| 7 | wget https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh | 7 | wget https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh |
| @@ -10,7 +10,7 @@ sh cmake-3.10.1-Linux-x86_64.sh --exclude-subdir --prefix=/ --skip-license | |||
| 10 | cd /yuzu | 10 | cd /yuzu |
| 11 | 11 | ||
| 12 | mkdir build && cd build | 12 | mkdir build && cd build |
| 13 | cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release | 13 | cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -G Ninja |
| 14 | make -j4 | 14 | ninja |
| 15 | 15 | ||
| 16 | ctest -VV -C Release | 16 | ctest -VV -C Release |