Commit 9ea2087e authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

parent 9f7c6341

docs/INSTALL

+8 −1
Original line number Diff line number Diff line
@@ -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

src/Makefile.vc6

+10 −7
Original line number Diff line number Diff line
@@ -24,10 +24,14 @@ LINKR = link.exe /incremental:no /libpath:"../lib" 
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 \
@@ -47,16 +51,15 @@ LINK_OBJS= \ 
	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