removed zlib dependence from default target; added new zlib targets.

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 67570d7..34f6f62 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -23,6 +23,13 @@ OPENSSL_PATH = ../../openssl-0.9.9d
 \r
 ########################################################\r
 ## Nothing more to do below this line!\r
+CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+ZLIBLIBS   = zlib.lib\r
+SSLINC     = /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
+CFLAGSSSL  = /D "USE_SSLEAY"\r
+LFLAGSSSL  = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
+SSLLIBS    = libeay32.lib ssleay32.lib gdi32.lib \r
 \r
 ## Release\r
 CCR = cl.exe /MD /O2 /D "NDEBUG"\r
@@ -34,11 +41,11 @@ CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ
 LINKD = link.exe /incremental:yes /debug /libpath:"../lib"\r
 RCD = rc.exe /dCURLDEBUG=1\r
 \r
-CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386\r
+CFLAGS = /I "../lib" /I "../include" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
+LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386\r
 RESFLAGS = /i "../include"\r
-LINKLIBS = wsock32.lib libcurl.lib winmm.lib zlib.lib\r
-LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib zlib.lib\r
+LINKLIBS = wsock32.lib libcurl.lib winmm.lib\r
+LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib\r
 \r
 RELEASE_OBJS= \\r
        hugehelpr.obj \\r
@@ -61,14 +68,22 @@ DEBUG_OBJS= \
        strtoofftd.obj \\r
        maind.obj \\r
        curld.res\r
-       \r
+\r
+######################\r
+# release-zlib\r
+\r
+!IF "$(CFG)" == "release-zlib"\r
+CFLAGS = $(CFLAGS) $(CFLAGSZLIB)\r
+LINKLIBS = $(LINKLIBS) $(ZLIBLIBS)\r
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(ZLIBLIBS)\r
+LFLAGS = $(LFLAGS) $(LFLAGSZLIB)\r
+!ENDIF\r
+\r
 ######################\r
 # release-ssl\r
  \r
 !IF "$(CFG)" == "release-ssl"\r
-LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
-SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib \r
-CFLAGS = $(CFLAGS) -DUSE_SSLEAY\r
+CFLAGS = $(CFLAGS) $(CFLAGSSSL)\r
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
 LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
@@ -78,14 +93,22 @@ LFLAGS = $(LFLAGS) $(LFLAGSSSL)
 # release-libcurl-ssl-dll\r
 \r
 !IF "$(CFG)" == "release-libcurl-ssl-dll"\r
-LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
-SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib \r
-CFLAGS = $(CFLAGS) -DUSE_SSLEAY\r
+CFLAGS = $(CFLAGS) $(CFLAGSSSL)\r
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
 LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
 !ENDIF\r
 \r
+######################\r
+# release-ssl-zlib\r
+ \r
+!IF "$(CFG)" == "release-ssl-zlib"\r
+CFLAGS = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB)\r
+LINKLIBS  = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBS)\r
+LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS) $(ZLIBLIBS)\r
+LFLAGS = $(LFLAGS) $(LFLAGSSSL) $(LFLAGSZLIB)\r
+!ENDIF\r
+\r
 \r
 all : release\r
 \r