moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Stenberg 2003-08-01 07:53:27 +00:00
parent 9f7c634133
commit 9ea2087ede
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/INSTALL
View File

@ -204,7 +204,14 @@ Win32
Before running nmake define the OPENSSL_PATH environment variable with Before running nmake define the OPENSSL_PATH environment variable with
the root/base directory of OpenSSL, for example: 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 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 directory. 'nmake vc-ssl' will create a libcurl static and dynamic

17
src/Makefile.vc6
View File

@ -24,10 +24,14 @@ LINKR = link.exe /incremental:no /libpath:"../lib"
CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ
LINKD = link.exe /incremental:yes /debug /libpath:"../lib" LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c !IFNDEF ZLIB_PATH
LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386 ZLIB_PATH = ../../zlib-1.1.4
LINKLIBS = ws2_32.lib libcurl.lib winmm.lib !ENDIF
LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib
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= \ RELEASE_OBJS= \
hugehelpr.obj \ hugehelpr.obj \
@ -46,17 +50,16 @@ LINK_OBJS= \
writeout.obj \ writeout.obj \
urlglob.obj \ urlglob.obj \
main.obj main.obj
###################### ######################
# release-ssl # release-ssl
!IF "$(CFG)" == "release-ssl" !IF "$(CFG)" == "release-ssl"
!IFNDEF OPENSSL_PATH !IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.6 OPENSSL_PATH = ../../openssl-0.9.7a
!ENDIF !ENDIF
LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32" LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
SSLLIBS = libeay32.lib ssleay32.lib RSAglue.lib gdi32.lib SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS) $(SSLLIBS)
LFLAGS = $(LFLAGS) $(LFLAGSSSL) LFLAGS = $(LFLAGS) $(LFLAGSSSL)
!ENDIF !ENDIF