David Byron's patch for MSVC builds with zlib

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 176399f1053665b82fd59b6a2dc989d310ca82ab..8bf019d194ec584955a768e51963bae5f6b406ba 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -19,6 +19,7 @@
 # files in the "cfg" directory, but then the make file\r
 # in \src would need to be changed.\r
 #\r
+# $Id: Makefile.vc6,v 1.17 2004/01/13 08:57:01 bagder Exp $\r
 ##############################################################\r
 # CHANGE LOG\r
 # ------------------------------------------------------------\r
@@ -37,12 +38,17 @@ LIB_NAME_DEBUG = libcurld
 OPENSSL_PATH   = ../../openssl-0.9.7a\r
 !ENDIF\r
 \r
+!IFNDEF ZLIB_PATH\r
+ZLIB_PATH  = ../../zlib-1.1.4\r
+!ENDIF\r
+\r
 #############################################################\r
 ## Nothing more to do below this line!\r
 \r
 CCNODBG   = cl.exe /MD /O2 /D "NDEBUG"\r
 CCDEBUG   = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ\r
 CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
+CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"\r
 CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"\r
 \r
 LNKDLL    = link.exe /DLL  /def:libcurl.def\r
@@ -100,6 +106,19 @@ CFGSET   = TRUE
 RESOURCE = $(DIROBJ)\libcurl.res\r
 !ENDIF\r
 \r
+######################\r
+# release-ssl-zlib\r
+\r
+!IF "$(CFG)" == "release-ssl-zlib"\r
+TARGET   =$(LIB_NAME).lib\r
+DIROBJ   =.\$(CFG)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(TARGET)\r
+CC       = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)\r
+CFGSET   = TRUE\r
+!ENDIF\r
+\r
 ######################\r
 # release-libcurl-ssl-dll\r
 !IF "$(CFG)" == "release-libcurl-ssl-dll"\r
@@ -169,6 +188,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 !MESSAGE   release          - release static library\r
 !MESSAGE   release-dll      - release dll\r
 !MESSAGE   release-ssl      - release static library with ssl\r
+!MESSAGE   release-ssl-zlib - release static library with ssl and zlib\r
 !MESSAGE   release-ssl-dll  - release dll library with ssl\r
 !MESSAGE   release-libcurl-ssl-dll - static libcurl with shared ssl\r
 !MESSAGE   debug            - debug static library\r
@@ -223,6 +243,7 @@ X_OBJS= \
         $(DIROBJ)\http_ntlm.obj \\r
        $(DIROBJ)\md5.obj \\r
        $(DIROBJ)\strerror.obj \\r
+       $(DIROBJ)\content_encoding.obj \\r
        $(RESOURCE)\r
 \r
 all : $(TARGET)\r