diff options
| -rwxr-xr-x | .travis/linux-mingw/docker.sh | 4 | ||||
| -rwxr-xr-x | .travis/linux/docker.sh | 2 | ||||
| -rwxr-xr-x | .travis/macos/build.sh | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.travis/linux-mingw/docker.sh b/.travis/linux-mingw/docker.sh index 6cf43a006..1c3863e69 100755 --- a/.travis/linux-mingw/docker.sh +++ b/.travis/linux-mingw/docker.sh | |||
| @@ -23,8 +23,8 @@ echo '' >> /bin/cmd | |||
| 23 | chmod +x /bin/cmd | 23 | chmod +x /bin/cmd |
| 24 | 24 | ||
| 25 | mkdir build && cd build | 25 | mkdir build && cd build |
| 26 | cmake .. -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release | 26 | cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release |
| 27 | make -j4 | 27 | ninja |
| 28 | 28 | ||
| 29 | # Clean up the dirty hacks | 29 | # Clean up the dirty hacks |
| 30 | rm /bin/uname && mv /bin/uname1 /bin/uname | 30 | rm /bin/uname && mv /bin/uname1 /bin/uname |
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index 8b7e65911..e95203621 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh | |||
| @@ -6,7 +6,7 @@ apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev | |||
| 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 -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 | 9 | cmake .. -G Ninja -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 |
| 10 | ninja | 10 | ninja |
| 11 | 11 | ||
| 12 | ccache -s | 12 | ccache -s |
diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index b7b4c6f8c..0abd1a93a 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh | |||
| @@ -7,6 +7,7 @@ export Qt5_DIR=$(brew --prefix)/opt/qt5 | |||
| 7 | export UNICORNDIR=$(pwd)/externals/unicorn | 7 | export UNICORNDIR=$(pwd)/externals/unicorn |
| 8 | export PATH="/usr/local/opt/ccache/libexec:$PATH" | 8 | export PATH="/usr/local/opt/ccache/libexec:$PATH" |
| 9 | 9 | ||
| 10 | # TODO: Build using ninja instead of make | ||
| 10 | mkdir build && cd build | 11 | mkdir build && cd build |
| 11 | cmake --version | 12 | cmake --version |
| 12 | 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 | 13 | 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 |