From e026b66bbbb78f3c43c067eb94675d4782fb70b6 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Mon, 15 Jan 2018 20:53:53 -0700 Subject: Build: Add unicorn as a submodule and build it if needed Adds a cmake custom target that will build unicorn on first compile and uses this in the build scripts as well. Updates Appveyor and Travis build scripts to work with the new unicorn build, and updates the paths to all of the different artifacts. --- .travis/linux/docker.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to '.travis/linux/docker.sh') 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 -- cgit v1.2.3