diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-12-24 22:24:01 +0100 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-12-28 21:32:39 +0100 |
| commit | ef4c4e239da8e5771f61bf079eae25b28cbd0318 (patch) | |
| tree | c9d26a55a5ca150de64adf33ed14eb6cfcf1144f /.travis | |
| parent | main: Add main window integrations for QtWebBrowserApplet (diff) | |
| download | yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar.gz yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar.bz2 yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar.lz yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar.xz yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar.zst yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.zip | |
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/linux/docker.sh | 4 | ||||
| -rwxr-xr-x | .travis/macos/build.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index 4fe3326f9..ec2cd0874 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh @@ -1,12 +1,12 @@ #!/bin/bash -ex apt-get update -apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget cmake ninja-build ccache +apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev libqt5webengine5 wget cmake ninja-build ccache cd /yuzu mkdir build && cd build -cmake .. -DYUZU_USE_BUNDLED_UNICORN=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 -G Ninja +cmake .. -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 -G Ninja ninja ccache -s diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index dce12099b..4a14837fc 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -9,7 +9,7 @@ export PATH="/usr/local/opt/ccache/libexec:$PATH" mkdir build && cd build cmake --version -cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DUSE_DISCORD_PRESENCE=ON +cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DUSE_DISCORD_PRESENCE=ON make -j4 ccache -s |