diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-10-12 16:33:30 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-10-12 22:10:46 +0200 |
| commit | 02e608f0bb42a7749a3737eea8ab28f87dcd8f46 (patch) | |
| tree | 151e565a3374965e0422523e50a2e7c71d5d970b | |
| parent | 0dc14b83818f6166d60e939ce2cc1c4806d39c4a (diff) | |
appveyor: add a winbuild that uses VS2017
Closes #4482
| -rw-r--r-- | appveyor.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml index d3a5ff24e..e2eb28e56 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -117,6 +117,11 @@ environment: WINSSL: OFF TESTING: OFF - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" + BUILD_SYSTEM: winbuild17 + OPENSSL: ON + WINSSL: OFF + TESTING: OFF + - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" BUILD_SYSTEM: VisualStudioSolution PRJ_CFG: "DLL Debug - DLL Windows SSPI - DLL WinIDN" TESTING: OFF @@ -154,7 +159,13 @@ build_script: call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 && nmake /f Makefile.vc mode=dll VC=15 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 - ))) + ) else ( + if %BUILD_SYSTEM%==winbuild17 ( + call buildconf.bat && + cd winbuild && + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" && + nmake /f Makefile.vc mode=dll VC=15 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 + )))) test_script: - if %TESTING%==ON ( |