Added winssl-zlib target to VC builds.

3 files changed, 55 insertions, 17 deletions

diff --git a/Makefile.dist b/Makefile.dist
index a4fbef15c..3efb8ebef 100644
--- 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 9966620c1..fda1e13a4 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -103,23 +103,24 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK"
 #############################################################

 ## Nothing more to do below this line!

 

-CCNODBG    = cl.exe /O2 /DNDEBUG

-CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /GZ

-CFLAGSSSL  = /DUSE_SSLEAY /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"

-CFLAGSSSH2 = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"

-CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"

-CFLAGS     = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1

-CFLAGSLIB  = /DCURL_STATICLIB

-LNKDLL     = link.exe /DLL

-LNKLIB     = link.exe /lib

-LFLAGS     = /nologo /machine:$(MACHINE)

-SSLLIBS    = libeay32.lib ssleay32.lib

-ZLIBLIBSDLL= zdll.lib

-ZLIBLIBS   = zlib.lib

-WINLIBS    = ws2_32.lib wldap32.lib advapi32.lib

-CFLAGS     = $(CFLAGS)

-

-CFGSET     = FALSE

+CCNODBG      = cl.exe /O2 /DNDEBUG

+CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /GZ

+CFLAGSSSL    = /DUSE_SSLEAY /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"

+CFLAGSWINSSL = /DUSE_SCHANNEL

+CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"

+CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"

+CFLAGS       = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1

+CFLAGSLIB    = /DCURL_STATICLIB

+LNKDLL       = link.exe /DLL

+LNKLIB       = link.exe /lib

+LFLAGS       = /nologo /machine:$(MACHINE)

+SSLLIBS      = libeay32.lib ssleay32.lib

+ZLIBLIBSDLL  = zdll.lib

+ZLIBLIBS     = zlib.lib

+WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib

+CFLAGS       = $(CFLAGS)

+

+CFGSET       = FALSE

 

 !IFDEF WINDOWS_SSPI

 CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include

@@ -190,6 +191,18 @@ CFGSET   = TRUE
 !ENDIF

 

 ######################

+# release-winssl-zlib

+

+!IF "$(CFG)" == "release-winssl-zlib"

+TARGET   = $(LIBCURL_STA_LIB_REL)

+DIROBJ   = $(CFG)

+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

+LNK      = $(LNKLIB) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSWINSSL) $(CFLAGSZLIB) $(CFLAGSLIB)

+CFGSET   = TRUE

+!ENDIF

+

+######################

 # release-ssl-ssh2-zlib

 

 !IF "$(CFG)" == "release-ssl-ssh2-zlib"

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index ada265f24..48331de24 100644
--- 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"

 SSL_LIBS       = libeay32.lib ssleay32.lib gdi32.lib user32.lib

 

+WINSSL_CFLAGS  = /DUSE_SCHANNEL

+#WINSSL_LIBS    = gdi32.lib user32.lib

+

 # Runtime library configuration

 RTLIB   = /MD

 RTLIBD  = /MDd

@@ -276,6 +279,16 @@ LFLAGS         = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS)
 !ENDIF

 

 #################################################

+# release static library with winssl and zlib

+

+!IF "$(CFG)" == "release-winssl-zlib"

+CFLAGS         = $(CFLAGS) $(WINSSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB

+LINKLIBS       = $(LIBCURL_STA_LIB_REL) $(WINSSL_LIBS) $(ZLIB_LIBS)

+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(WINSSL_LIBS) $(ZLIB_LIBS)

+LFLAGS         = $(LFLAGS) $(WINSSL_LFLAGS) $(ZLIB_LFLAGS)

+!ENDIF

+

+#################################################

 # release static library with dynamic ssl

 

 !IF "$(CFG)" == "release-ssl-dll"