diff options
| author |  Zach Hilman | 2018-12-24 16:24:01 -0500 |
|---|---|---|
| committer | Zach Hilman | 2018-12-28 15:32:39 -0500 |
| commit | ef4c4e239da8e5771f61bf079eae25b28cbd0318 (patch) | |
| tree | c9d26a55a5ca150de64adf33ed14eb6cfcf1144f /.travis/linux | |
| parent | main: Add main window integrations for QtWebBrowserApplet (diff) | |
| download | yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar.gz yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.tar.xz yuzu-ef4c4e239da8e5771f61bf079eae25b28cbd0318.zip | |
cmake: Add USE_QT_WEB_ENGINE flag and update build system
Diffstat (limited to '.travis/linux')
| -rwxr-xr-x | .travis/linux/docker.sh | 4 |
1 files changed, 2 insertions, 2 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 @@ | |||
| 1 | #!/bin/bash -ex | 1 | #!/bin/bash -ex |
| 2 | 2 | ||
| 3 | apt-get update | 3 | apt-get update |
| 4 | apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget cmake ninja-build ccache | 4 | 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 |
| 5 | 5 | ||
| 6 | cd /yuzu | 6 | cd /yuzu |
| 7 | 7 | ||
| 8 | mkdir build && cd build | 8 | mkdir build && cd build |
| 9 | 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 | 9 | 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 |
| 10 | ninja | 10 | ninja |
| 11 | 11 | ||
| 12 | ccache -s | 12 | ccache -s |