|
@@ -15,8 +15,8 @@ matrix:
|
|
|
|
|
|
image:
|
|
image:
|
|
- Visual Studio 2013
|
|
- Visual Studio 2013
|
|
- #- Previous Visual Studio 2015
|
|
|
|
- - Previous Visual Studio 2017
|
|
|
|
|
|
+ - Visual Studio 2015
|
|
|
|
+ - Visual Studio 2017
|
|
|
|
|
|
platform:
|
|
platform:
|
|
- Win32
|
|
- Win32
|
|
@@ -28,22 +28,22 @@ install:
|
|
- set PATH=C:\Ruby24-x64\bin;%PATH%
|
|
- set PATH=C:\Ruby24-x64\bin;%PATH%
|
|
- set CMAKE_DEFINES -DASSIMP_WERROR=ON
|
|
- 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 2013" set CMAKE_GENERATOR_NAME=Visual Studio 12 2013
|
|
- - 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 "%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 "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64
|
|
- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_NAME% Win64
|
|
- cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%"
|
|
- cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%"
|
|
- set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"
|
|
- set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"
|
|
- ps: Invoke-WebRequest -Uri https://download.microsoft.com/download/5/7/b/57b2947c-7221-4f33-b35e-2fc78cb10df4/vc_redist.x64.exe -OutFile .\packaging\windows-innosetup\vc_redist.x64.exe
|
|
- ps: Invoke-WebRequest -Uri https://download.microsoft.com/download/5/7/b/57b2947c-7221-4f33-b35e-2fc78cb10df4/vc_redist.x64.exe -OutFile .\packaging\windows-innosetup\vc_redist.x64.exe
|
|
- ps: Invoke-WebRequest -Uri https://download.microsoft.com/download/1/d/8/1d8137db-b5bb-4925-8c5d-927424a2e4de/vc_redist.x86.exe -OutFile .\packaging\windows-innosetup\vc_redist.x86.exe
|
|
- ps: Invoke-WebRequest -Uri https://download.microsoft.com/download/1/d/8/1d8137db-b5bb-4925-8c5d-927424a2e4de/vc_redist.x86.exe -OutFile .\packaging\windows-innosetup\vc_redist.x86.exe
|
|
|
|
|
|
-#cache:
|
|
|
|
-# - code\assimp.dir\%CONFIGURATION%
|
|
|
|
-# - contrib\zlib\zlibstatic.dir\%CONFIGURATION%
|
|
|
|
-# - contrib\zlib\zlib.dir\%CONFIGURATION%
|
|
|
|
-# - tools\assimp_cmd\assimp_cmd.dir\%CONFIGURATION%
|
|
|
|
-# - tools\assimp_view\assimp_viewer.dir\%CONFIGURATION%
|
|
|
|
-# - test\unit.dir\%CONFIGURATION%
|
|
|
|
-# - bin\.mtime_cache
|
|
|
|
|
|
+cache:
|
|
|
|
+ - code\assimp.dir\%CONFIGURATION%
|
|
|
|
+ - contrib\zlib\zlibstatic.dir\%CONFIGURATION%
|
|
|
|
+ - contrib\zlib\zlib.dir\%CONFIGURATION%
|
|
|
|
+ - tools\assimp_cmd\assimp_cmd.dir\%CONFIGURATION%
|
|
|
|
+ - tools\assimp_view\assimp_viewer.dir\%CONFIGURATION%
|
|
|
|
+ - test\unit.dir\%CONFIGURATION%
|
|
|
|
+ - bin\.mtime_cache
|
|
|
|
|
|
before_build:
|
|
before_build:
|
|
- ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json
|
|
- ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json
|