summaryrefslogtreecommitdiff
path: root/appveyor.yml
diff options
context:
space:
mode:
authorGravatar Michał Janiszewski2018-06-05 22:46:54 +0200
committerGravatar Michał Janiszewski2018-06-05 22:46:54 +0200
commit5c3d5d08495073178bedccbc688ac3f3eb73abe3 (patch)
tree2e1f3835af353bb65210d469ffa069dfdbb9364c /appveyor.yml
parentDrop /std:c++latest from MSVC command line (diff)
downloadyuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.gz
yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.tar.xz
yuzu-5c3d5d08495073178bedccbc688ac3f3eb73abe3.zip
Use Ninja for MSVC AppVeyor builds
Diffstat (limited to 'appveyor.yml')
-rw-r--r--appveyor.yml14
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:
36 } 36 }
37 37
38before_build: 38before_build:
39 # Install Ninja
40 - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip"
41 - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
42 - 7z x ninja.zip -oC:\projects\deps\ninja > nul
43 - set PATH=C:\projects\deps\ninja;%PATH%
44 - ninja --version
45 - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
46
39 - mkdir %BUILD_TYPE%_build 47 - mkdir %BUILD_TYPE%_build
40 - cd %BUILD_TYPE%_build 48 - cd %BUILD_TYPE%_build
41 - ps: | 49 - ps: |
42 if ($env:BUILD_TYPE -eq 'msvc') { 50 if ($env:BUILD_TYPE -eq 'msvc') {
43 # redirect stderr and change the exit code to prevent powershell from cancelling the build if cmake prints a warning 51 # redirect stderr and change the exit code to prevent powershell from cancelling the build if cmake prints a warning
44 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' 52 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'
45 } else { 53 } else {
46 C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -DYUZU_BUILD_UNICORN=1 -DCMAKE_BUILD_TYPE=Release .. 2>&1" 54 C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -DYUZU_BUILD_UNICORN=1 -DCMAKE_BUILD_TYPE=Release .. 2>&1"
47 } 55 }
@@ -51,7 +59,7 @@ build_script:
51 - ps: | 59 - ps: |
52 if ($env:BUILD_TYPE -eq 'msvc') { 60 if ($env:BUILD_TYPE -eq 'msvc') {
53 # https://www.appveyor.com/docs/build-phase 61 # https://www.appveyor.com/docs/build-phase
54 msbuild msvc_build/yuzu.sln /maxcpucount /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" 62 ninja -C msvc_build
55 } else { 63 } else {
56 C:\msys64\usr\bin\bash.exe -lc 'mingw32-make -C mingw_build/ 2>&1' 64 C:\msys64\usr\bin\bash.exe -lc 'mingw32-make -C mingw_build/ 2>&1'
57 } 65 }
@@ -80,7 +88,7 @@ after_build:
80 $env:BUILD_SYMBOLS = $MSVC_BUILD_PDB 88 $env:BUILD_SYMBOLS = $MSVC_BUILD_PDB
81 $env:BUILD_UPDATE = $MSVC_SEVENZIP 89 $env:BUILD_UPDATE = $MSVC_SEVENZIP
82 90
83 $BUILD_DIR = ".\msvc_build\bin\Release" 91 $BUILD_DIR = ".\msvc_build\bin"
84 92
85 # Make a debug symbol upload 93 # Make a debug symbol upload
86 mkdir pdb 94 mkdir pdb