diff options
| author | bunnei <bunneidev@gmail.com> | 2018-06-23 09:17:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-23 09:17:32 +0200 |
| commit | 0b831dd2ba26e8d13b166efe914e9234ee5d04e1 (patch) | |
| tree | c251581c2b52ec40d15cf8d1078da7bfa42f831a /appveyor.yml | |
| parent | Fixed RequestUpdateAudioRenderer deadlocks and calculated section sizes properly (#580) (diff) | |
| download | yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar.gz yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar.bz2 yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar.lz yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar.xz yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.tar.zst yuzu-0b831dd2ba26e8d13b166efe914e9234ee5d04e1.zip | |
Diffstat (limited to '')
| -rw-r--r-- | appveyor.yml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/appveyor.yml b/appveyor.yml index fb16cae17..72cda26a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,20 +36,12 @@ 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 "Ninja" -DCMAKE_BUILD_TYPE=Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_BUNDLED_UNICORN=1 .. 2>&1 && exit 0' + 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' } else { C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -DYUZU_BUILD_UNICORN=1 -DCMAKE_BUILD_TYPE=Release .. 2>&1" } @@ -59,7 +51,7 @@ build_script: - ps: | if ($env:BUILD_TYPE -eq 'msvc') { # https://www.appveyor.com/docs/build-phase - ninja -C msvc_build + msbuild msvc_build/yuzu.sln /maxcpucount /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" } else { C:\msys64\usr\bin\bash.exe -lc 'mingw32-make -C mingw_build/ 2>&1' } @@ -88,7 +80,7 @@ after_build: $env:BUILD_SYMBOLS = $MSVC_BUILD_PDB $env:BUILD_UPDATE = $MSVC_SEVENZIP - $BUILD_DIR = ".\msvc_build\bin" + $BUILD_DIR = ".\msvc_build\bin\Release" # Make a debug symbol upload mkdir pdb |