summaryrefslogtreecommitdiffstats
path: root/.travis/linux
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2018-01-16 04:53:53 +0100
committerJames Rowe <jroweboy@gmail.com>2018-01-16 09:15:52 +0100
commite026b66bbbb78f3c43c067eb94675d4782fb70b6 (patch)
treed64dd737b71c7845c92b598c3e2aee4314343537 /.travis/linux
parentMerge pull request #25 from chris062689/master (diff)
downloadyuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar
yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar.gz
yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar.bz2
yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar.lz
yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar.xz
yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.tar.zst
yuzu-e026b66bbbb78f3c43c067eb94675d4782fb70b6.zip
Diffstat (limited to '.travis/linux')
-rwxr-xr-x.travis/linux/docker.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh
index a85225c5a..8a23b54b1 100755
--- a/.travis/linux/docker.sh
+++ b/.travis/linux/docker.sh
@@ -1,22 +1,16 @@
#!/bin/bash -ex
apt-get update
-apt-get install -y build-essential git libcurl4-openssl-dev libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget
+apt-get install -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget
# 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
-mkdir /unicorn
-cd /unicorn
-git clone https://github.com/yuzu-emu/unicorn .
-UNICORN_ARCHS=aarch64 ./make.sh
-./make.sh install
-
cd /yuzu
mkdir build && cd build
-cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_BUILD_TYPE=Release
+cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release
make -j4
ctest -VV -C Release