Added winssl-zlib target to VC builds.

diff --git a/Makefile.dist b/Makefile.dist
index a4fbef1..3efb8eb 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -148,12 +148,24 @@ vc-ssl-zlib: $(VC)
        cd ..\src
        nmake /f Makefile.$(VC) cfg=release-ssl-zlib
 
+vc-winssl-zlib: $(VC)
+       cd lib
+       nmake /f Makefile.$(VC) cfg=release-winssl-zlib
+       cd ..\src
+       nmake /f Makefile.$(VC) cfg=release-winssl-zlib
+
 vc-x64-ssl-zlib: $(VC)
        cd lib
        nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib
        cd ..\src
        nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-ssl-zlib
 
+vc-x64-winssl-zlib: $(VC)
+       cd lib
+       nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl-zlib
+       cd ..\src
+       nmake /f Makefile.$(VC) MACHINE=x64 cfg=release-winssl-zlib
+
 vc-ssl-dll: $(VC)
        cd lib
        nmake /f Makefile.$(VC) cfg=release-ssl-dll

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 9966620..fda1e13 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -103,23 +103,24 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
 #############################################################\r
 ## Nothing more to do below this line!\r
 \r
-CCNODBG    = cl.exe /O2 /DNDEBUG\r
-CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ\r
-CFLAGSSSL  = /DUSE_SSLEAY /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
-CFLAGSSSH2 = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"\r
-CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
-CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1\r
-CFLAGSLIB  = /DCURL_STATICLIB\r
-LNKDLL     = link.exe /DLL\r
-LNKLIB     = link.exe /lib\r
-LFLAGS     = /nologo /machine:$(MACHINE)\r
-SSLLIBS    = libeay32.lib ssleay32.lib\r
-ZLIBLIBSDLL= zdll.lib\r
-ZLIBLIBS   = zlib.lib\r
-WINLIBS    = ws2_32.lib wldap32.lib advapi32.lib\r
-CFLAGS     = $(CFLAGS)\r
-\r
-CFGSET     = FALSE\r
+CCNODBG      = cl.exe /O2 /DNDEBUG\r
+CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /GZ\r
+CFLAGSSSL    = /DUSE_SSLEAY /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
+CFLAGSWINSSL = /DUSE_SCHANNEL\r
+CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"\r
+CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
+CFLAGS       = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1\r
+CFLAGSLIB    = /DCURL_STATICLIB\r
+LNKDLL       = link.exe /DLL\r
+LNKLIB       = link.exe /lib\r
+LFLAGS       = /nologo /machine:$(MACHINE)\r
+SSLLIBS      = libeay32.lib ssleay32.lib\r
+ZLIBLIBSDLL  = zdll.lib\r
+ZLIBLIBS     = zlib.lib\r
+WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib\r
+CFLAGS       = $(CFLAGS)\r
+\r
+CFGSET       = FALSE\r
 \r
 !IFDEF WINDOWS_SSPI\r
 CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include\r
@@ -190,6 +191,18 @@ CFGSET   = TRUE
 !ENDIF\r
 \r
 ######################\r
+# release-winssl-zlib\r
+\r
+!IF "$(CFG)" == "release-winssl-zlib"\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
+DIROBJ   = $(CFG)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+!ENDIF\r
+\r
+######################\r
 # release-ssl-ssh2-zlib\r
 \r
 !IF "$(CFG)" == "release-ssl-ssh2-zlib"\r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index ada265f..48331de 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -100,6 +100,9 @@ SSL_LFLAGS     = /LIBPATH:"$(OPENSSL_PATH)/out32"
 SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"\r
 SSL_LIBS       = libeay32.lib ssleay32.lib gdi32.lib user32.lib\r
 \r
+WINSSL_CFLAGS  = /DUSE_SCHANNEL\r
+#WINSSL_LIBS    = gdi32.lib user32.lib\r
+\r
 # Runtime library configuration\r
 RTLIB   = /MD\r
 RTLIBD  = /MDd\r
@@ -276,6 +279,16 @@ LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)
 !ENDIF\r
 \r
 #################################################\r
+# release static library with winssl and zlib\r
+\r
+!IF "$(CFG)" == "release-winssl-zlib"\r
+CFLAGS         = $(CFLAGS) $(WINSSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB\r
+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(WINSSL_LIBS) $(ZLIB_LIBS)\r
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(WINSSL_LIBS) $(ZLIB_LIBS)\r
+LFLAGS         = $(LFLAGS) $(WINSSL_LFLAGS) $(ZLIB_LFLAGS)\r
+!ENDIF\r
+\r
+#################################################\r
 # release static library with dynamic ssl\r
 \r
 !IF "$(CFG)" == "release-ssl-dll"\r