From eb8afab86504ce77f42529a26bc674a3c402773e Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 21 May 2017 15:56:25 -0700 Subject: [PATCH 1/2] Upgrade AppVeyor to Visual Studio 2017 More C++14/17 goodness! --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2a4a15d40..c81601e01 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 @@ -21,10 +21,10 @@ install: before_build: # Xamarin log spam workaround - - del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" + - del "C:\Program Files (x86)\MSBuild\15.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: From 6c26b6efbc62c9f0a5832994c261ff1a7cae9b80 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 21 May 2017 15:59:11 -0700 Subject: [PATCH 2/2] Remove "Xamarin logspam" workaround The file does not seem to exist anymore in the VS 2017 environment. --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c81601e01..6b5d23b03 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,8 +20,6 @@ install: - git submodule update --init --recursive before_build: - # Xamarin log spam workaround - - del "C:\Program Files (x86)\MSBuild\15.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" - mkdir build - cd build - cmake -G "Visual Studio 15 2017 Win64" -DCITRA_USE_BUNDLED_QT=1 -DCITRA_USE_BUNDLED_SDL2=1 ..