Merge 5e0187c0a2 into d809f65827

Update docker.sh
Pull request #479 - Use Ninja for Travis builds
2018-05-28 16:15:39 +00:00 · 2018-05-28 10:15:34 -03:00 · 2018-05-28 09:06:11 -03:00
1 changed files with 3 additions and 3 deletions
--- a/.travis/linux/docker.sh
+++ b/.travis/linux/docker.sh
@@ -4,9 +4,9 @@ apt-get update
 apt-get install -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget ninja-build

 # Get a recent version of CMake
-wget https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh
-sh cmake-3.10.1-Linux-x86_64.sh --exclude-subdir --prefix=/ --skip-license
-
+wget https://cmake.org/files/v3.11/cmake-3.11.2-Linux-x86_64.sh
+sh cmake-3.11.2-Linux-x86_64.sh --exclude-subdir --prefix=/ --skip-license
+sh qt-5.11.0-Linux-x86_64.sh --exclude-subdir --prefix=/ --skip-lincense
 cd /yuzu

 mkdir build && cd build
Author	SHA1	Message	Date
NekokoTime	89b707235c	Merge `5e0187c0a2` into `d809f65827`	2018-05-28 16:15:39 +00:00
NekokoTime	5e0187c0a2	Update docker.sh	2018-05-28 10:15:34 -03:00
NekokoTime	cd378a7bff	Pull request #479 - Use Ninja for Travis builds Add Update fron Cmake 3.11.2 for linux	2018-05-28 09:06:11 -03:00