From 9c326e6989b47accb4032bd18becda47f832901a Mon Sep 17 00:00:00 2001 From: escherstair Date: Wed, 2 Oct 2019 10:21:56 +0200 Subject: [PATCH 1/6] Add AppVeyor build VS2013 and VS2019 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 3729ea028..5e61cbdc1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,8 +14,10 @@ matrix: fast_finish: true image: + - Visual Studio 2013 - Visual Studio 2015 - Visual Studio 2017 + - Visual Studio 2019 platform: - Win32 From d0e8f5ca321cda18e6f07672b85964948d297062 Mon Sep 17 00:00:00 2001 From: escherstair Date: Wed, 2 Oct 2019 10:30:50 +0200 Subject: [PATCH 2/6] add cmake generators for VS2013 and VS2019 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 7038b0ef6..52adc10cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,8 +30,10 @@ install: - set PATH=C:\Ruby24-x64\bin;%PATH% - set CMAKE_DEFINES -DASSIMP_WERROR=ON - if [%COMPILER%]==[MinGW] set PATH=C:\MinGW\bin;%PATH% + - 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%"=="Visual Studio 2019" set CMAKE_GENERATOR_NAME=Visual Studio 16 2019 - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64 - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%" . # Rename sh.exe as sh.exe in PATH interferes with MinGW From f2a70ad10ced9fd4cdcdc493fb5af3967e2af1fa Mon Sep 17 00:00:00 2001 From: escherstair Date: Wed, 2 Oct 2019 10:43:06 +0200 Subject: [PATCH 3/6] remove VS2013 build --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 52adc10cf..21cda6a2d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,6 @@ matrix: fast_finish: true image: - - Visual Studio 2013 - Visual Studio 2015 - Visual Studio 2017 - Visual Studio 2019 @@ -30,7 +29,6 @@ install: - set PATH=C:\Ruby24-x64\bin;%PATH% - set CMAKE_DEFINES -DASSIMP_WERROR=ON - if [%COMPILER%]==[MinGW] set PATH=C:\MinGW\bin;%PATH% - - 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%"=="Visual Studio 2019" set CMAKE_GENERATOR_NAME=Visual Studio 16 2019 From 97e060c4285e842a7d74cffa8ee9aa4164d00ee8 Mon Sep 17 00:00:00 2001 From: escherstair Date: Mon, 7 Oct 2019 09:34:02 +0200 Subject: [PATCH 4/6] added CMAKE_GENERATOR_PLATFORM --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 21cda6a2d..419b50298 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,8 +32,9 @@ install: - 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%"=="Visual Studio 2019" set CMAKE_GENERATOR_NAME=Visual Studio 16 2019 - - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64 - - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%" . + - set CMAKE_GENERATOR_PLATFORM=%platform% + #- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64 + - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%" -A "CMAKE_GENERATOR_PLATFORM". # Rename sh.exe as sh.exe in PATH interferes with MinGW - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5" From 128602f29b733dd0e2aabd5a81b7af31386c31b3 Mon Sep 17 00:00:00 2001 From: escherstair Date: Mon, 7 Oct 2019 10:12:40 +0200 Subject: [PATCH 5/6] fixed fatal error --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 419b50298..e7c62cf46 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,9 +32,9 @@ install: - 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%"=="Visual Studio 2019" set CMAKE_GENERATOR_NAME=Visual Studio 16 2019 - - set CMAKE_GENERATOR_PLATFORM=%platform% + #- set CMAKE_GENERATOR_PLATFORM=%platform% #- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64 - - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%" -A "CMAKE_GENERATOR_PLATFORM". + - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%" -A %platform% . # Rename sh.exe as sh.exe in PATH interferes with MinGW - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5" From c63f5b2f9e6a0d4c38fa16003fb986cf2da49423 Mon Sep 17 00:00:00 2001 From: escherstair Date: Mon, 7 Oct 2019 11:38:45 +0200 Subject: [PATCH 6/6] removed unused lines --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e7c62cf46..df16431bd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,8 +32,6 @@ install: - 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%"=="Visual Studio 2019" set CMAKE_GENERATOR_NAME=Visual Studio 16 2019 - #- set CMAKE_GENERATOR_PLATFORM=%platform% - #- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64 - cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%" -A %platform% . # Rename sh.exe as sh.exe in PATH interferes with MinGW - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"