diff options
| author | Michał Janiszewski <janisozaur@gmail.com> | 2018-06-05 22:46:54 +0200 |
|---|---|---|
| committer | Michał Janiszewski <janisozaur@gmail.com> | 2018-06-05 22:46:54 +0200 |
| commit | 5c3d5d08495073178bedccbc688ac3f3eb73abe3 (patch) | |
| tree | 2e1f3835af353bb65210d469ffa069dfdbb9364c /appveyor.yml | |
| parent | Drop /std:c++latest from MSVC command line (diff) | |
| download | yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.gz yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.bz2 yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.lz yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.xz yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.zst yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.zip | |
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index 72cda26a7..fb16cae17 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,12 +36,20 @@ install: } before_build: + # Install Ninja + - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip" + - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip + - 7z x ninja.zip -oC:\projects\deps\ninja > nul + - set PATH=C:\projects\deps\ninja;%PATH% + - ninja --version + - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 + - mkdir %BUILD_TYPE%_build - cd %BUILD_TYPE%_build - ps: | if ($env:BUILD_TYPE -eq 'msvc') { # redirect stderr and change the exit code to prevent powershell from cancelling the build if cmake prints a warning - cmd /C 'cmake -G "Visual Studio 15 2017 Win64" -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_BUNDLED_UNICORN=1 .. 2>&1 && exit 0' + cmd /C 'cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_BUNDLED_UNICORN=1 .. 2>&1 && exit 0' } else { C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -DYUZU_BUILD_UNICORN=1 -DCMAKE_BUILD_TYPE=Release .. 2>&1" } @@ -51,7 +59,7 @@ build_script: - ps: | if ($env:BUILD_TYPE -eq 'msvc') { # https://www.appveyor.com/docs/build-phase - msbuild msvc_build/yuzu.sln /maxcpucount /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + ninja -C msvc_build } else { C:\msys64\usr\bin\bash.exe -lc 'mingw32-make -C mingw_build/ 2>&1' } @@ -80,7 +88,7 @@ after_build: $env:BUILD_SYMBOLS = $MSVC_BUILD_PDB $env:BUILD_UPDATE = $MSVC_SEVENZIP - $BUILD_DIR = ".\msvc_build\bin\Release" + $BUILD_DIR = ".\msvc_build\bin" # Make a debug symbol upload mkdir pdb |