David Byron's makefile fix to allow 7.10.6 to build fine using VC

diff --git a/docs/INSTALL b/docs/INSTALL
index fb75a45d6128f72baa2c271f6925506327d1bb80..36ff17fdb64da5f33d644ed720e0cc3c1b0aefd5 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -204,7 +204,14 @@ Win32
         Before running nmake define the OPENSSL_PATH environment variable with
         the root/base directory of OpenSSL, for example:
 
-          set OPENSSL_PATH=c:\openssl-0.9.6b
+          set OPENSSL_PATH=c:\openssl-0.9.7a
+
+        lib/Makefile.vc6 depends on zlib (http://www.gzip.org/zlib/) as well.
+        Please read the zlib documentation on how to compile zlib.  Define the
+        ZLIB_PATH environment variable to the location of zlib.h and zlib.lib,
+        for example:
+
+          set ZLIB_PATH=c:\zlib-1.1.4
 
         Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
         directory.  'nmake vc-ssl' will create a libcurl static and dynamic

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 4db47968182d0163abebd1f28cbcf3dd12de2b3d..4784022fe26ebb9c5bcc885a153c15e5e4e2b38a 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -24,10 +24,14 @@ LINKR = link.exe /incremental:no /libpath:"../lib"
 CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ\r
 LINKD = link.exe /incremental:yes /debug /libpath:"../lib"\r
 \r
-CFLAGS = /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
-LINKLIBS = ws2_32.lib libcurl.lib winmm.lib\r
-LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib\r
+!IFNDEF ZLIB_PATH\r
+ZLIB_PATH  = ../../zlib-1.1.4\r
+!ENDIF\r
+\r
+CFLAGS = /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
+LINKLIBS = ws2_32.lib libcurl.lib winmm.lib zlib.lib\r
+LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib zlib.lib\r
 \r
 RELEASE_OBJS= \\r
        hugehelpr.obj \\r
@@ -46,17 +50,16 @@ LINK_OBJS= \
        writeout.obj \\r
        urlglob.obj \\r
        main.obj\r
-\r
  \r
 ######################\r
 # release-ssl\r
  \r
 !IF "$(CFG)" == "release-ssl"\r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH   = ../../openssl-0.9.6\r
+OPENSSL_PATH   = ../../openssl-0.9.7a\r
 !ENDIF\r
 LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
-SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib gdi32.lib \r
+SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib \r
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
 !ENDIF\r