summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2017-05-21 17:18:58 -0600
committerGitHub <noreply@github.com>2017-05-21 17:18:58 -0600
commit0f2e32c01764fff3d432fa04b5d809b059deb29e (patch)
tree6c592c652191f22cfb0c243fc1dfccd63fe4bd9e
parentd2bb0a6f2d8457a910ecd8f1dcc7d1f496617b75 (diff)
parent6c26b6efbc62c9f0a5832994c261ff1a7cae9b80 (diff)
Merge pull request #2718 from citra-emu/appveyor-vs2017
Upgrade AppVeyor to Visual Studio 2017
-rw-r--r--appveyor.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 2a4a15d40..6b5d23b03 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ cache:
- C:\ProgramData\chocolatey\bin -> appveyor.yml
- C:\ProgramData\chocolatey\lib -> appveyor.yml
-os: Visual Studio 2015
+os: Visual Studio 2017
platform:
- x64
@@ -20,11 +20,9 @@ install:
- git submodule update --init --recursive
before_build:
- # Xamarin log spam workaround
- - del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
- mkdir build
- cd build
- - cmake -G "Visual Studio 14 2015 Win64" -DCITRA_USE_BUNDLED_QT=1 -DCITRA_USE_BUNDLED_SDL2=1 ..
+ - cmake -G "Visual Studio 15 2017 Win64" -DCITRA_USE_BUNDLED_QT=1 -DCITRA_USE_BUNDLED_SDL2=1 ..
- cd ..
build: