Merge bbddd45 into 8986df8

appveyor.yml

@@ -112,14 +112,12 @@ environment:
         MSYS2_ARG_CONV_EXCL: "/*"
         BUILD_OPT: -k
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
-        BUILD_SYSTEM: winbuild
-        OPENSSL: ON
-        WINSSL: OFF
+        BUILD_SYSTEM: winbuild_vs2015
+        DEBUG: yes
         TESTING: OFF
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
-        BUILD_SYSTEM: winbuild17
-        OPENSSL: ON
-        WINSSL: OFF
+        BUILD_SYSTEM: winbuild_vs2017
+        DEBUG: no
         TESTING: OFF
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
         BUILD_SYSTEM: VisualStudioSolution
@@ -165,18 +163,20 @@ build_script:
         cd projects &&
         .\\generate.bat %VC_VERSION% &&
         msbuild.exe /p:Configuration="%PRJ_CFG%" "Windows\\%VC_VERSION%\\curl-all.sln" ) else (
-      if %BUILD_SYSTEM%==winbuild (
+      if %BUILD_SYSTEM%==winbuild_vs2015 (
         call buildconf.bat &&
         cd winbuild &&
         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
+        nmake /f Makefile.vc mode=dll VC=14 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 DEBUG=%DEBUG% &&
+        ..\src\curl -V
       ) else (
-      if %BUILD_SYSTEM%==winbuild17 (
+      if %BUILD_SYSTEM%==winbuild_vs2017 (
         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
+        nmake /f Makefile.vc mode=dll VC=15 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 DEBUG=%DEBUG% &&
+        ..\src\curl -V
       ))))
 
 test_script: