cvs: curl /docs INSTALL /src Makefile.vc6

bagder		Fri Aug  1 03:53:27 2003 EDT

  Modified files:              
    /curl/src	Makefile.vc6 
    /curl/docs	INSTALL 
  Log:
  David Byron's makefile fix to allow 7.10.6 to build fine using VC

  
Index: curl/src/Makefile.vc6
diff -u curl/src/Makefile.vc6:1.13 curl/src/Makefile.vc6:1.14
--- curl/src/Makefile.vc6:1.13	Wed Jul 30 10:26:36 2003
+++ curl/src/Makefile.vc6	Fri Aug  1 03:53:27 2003
 <at>  <at>  -24,10 +24,14  <at>  <at> 
 CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ
 LINKD = link.exe /incremental:yes /debug /libpath:"../lib"

-CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
-LINKLIBS = ws2_32.lib libcurl.lib winmm.lib
-LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib
+!IFNDEF ZLIB_PATH
+ZLIB_PATH  = ../../zlib-1.1.4
+!ENDIF
+
+CFLAGS = /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
+LINKLIBS = ws2_32.lib libcurl.lib winmm.lib zlib.lib
+LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib zlib.lib

 RELEASE_OBJS= \
 	hugehelpr.obj \
 <at>  <at>  -46,17 +50,16  <at>  <at> 
 	writeout.obj \
 	urlglob.obj \
 	main.obj
-

 ######################
 # release-ssl

 !IF "$(CFG)" == "release-ssl"
 !IFNDEF OPENSSL_PATH
-OPENSSL_PATH   = ../../openssl-0.9.6
+OPENSSL_PATH   = ../../openssl-0.9.7a
 !ENDIF
 LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
-SSLLIBS   = libeay32.lib ssleay32.lib RSAglue.lib gdi32.lib 
+SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib 
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS)
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)
 !ENDIF
Index: curl/docs/INSTALL
diff -u curl/docs/INSTALL:1.44 curl/docs/INSTALL:1.45
--- curl/docs/INSTALL:1.44	Tue May 27 03:37:34 2003
+++ curl/docs/INSTALL	Fri Aug  1 03:53:27 2003
 <at>  <at>  -204,7 +204,14  <at>  <at> 
         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

-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01