From f0ed1702b99df30ae593208e3a0e2db668d2f9e1 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 12 Mar 2019 20:49:14 +0100 Subject: [PATCH 1/3] Reenable vs2015 and vs1017 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a1890b9cb..2b5f212f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ matrix: image: - Visual Studio 2013 -# - Visual Studio 2015 -# - Visual Studio 2017 + - Visual Studio 2015 + - Visual Studio 2017 platform: - Win32 From ac80b116a9a29940d083ee03ff6a02ff76734338 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 12 Mar 2019 21:42:32 +0100 Subject: [PATCH 2/3] Update appveyor.yml Fix build image. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2b5f212f9..6924380e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ matrix: image: - Visual Studio 2013 - - Visual Studio 2015 - - Visual Studio 2017 + - Previous Visual Studio 2015 + - Previous Visual Studio 2017 platform: - Win32 From 63afcf82670ac12c78687cd00a6d373b3014a8f4 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 12 Mar 2019 21:56:28 +0100 Subject: [PATCH 3/3] Update appveyor.yml Fix cmake generation. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6924380e5..78ef4da75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,8 +28,8 @@ install: - set PATH=C:\Ruby24-x64\bin;%PATH% - set CMAKE_DEFINES -DASSIMP_WERROR=ON - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" set CMAKE_GENERATOR_NAME=Visual Studio 12 2013 - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 + - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Previous Visual Studio 2015" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 + - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Previous Visual Studio 2017" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64 - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%" - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"