diff options
| author | Cameron Cawley <ccawley2011@gmail.com> | 2018-08-24 00:32:48 +0200 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2019-04-16 01:06:34 +0200 |
| commit | 1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808 (patch) | |
| tree | 232108e7c91b69b6c9068c93616a4241552cfe9c | |
| parent | Merge pull request #2378 from lioncash/ro (diff) | |
| download | yuzu-1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808.tar yuzu-1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808.tar.gz yuzu-1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808.tar.bz2 yuzu-1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808.tar.lz yuzu-1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808.tar.xz yuzu-1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808.tar.zst yuzu-1f3cc036da6f3c2cfd3a6ba78a5a9daec7a4e808.zip | |
| -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 chmod +x /bin/cmd mkdir build && cd build -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 -make -j4 +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 +ninja # Clean up the dirty hacks 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 cd /yuzu mkdir build && cd build -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 +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 ninja 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 export UNICORNDIR=$(pwd)/externals/unicorn export PATH="/usr/local/opt/ccache/libexec:$PATH" +# TODO: Build using ninja instead of make mkdir build && cd build cmake --version 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 |