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

removed zlib dependence from default target; added new zlib targets.

Browse Source
This commit is contained in:
Gunter Knauf 2004-07-11 12:28:07 +00:00
parent 35270e50c2
commit 15f3b4b6d1
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Makefile.vc6
View File

@ -23,6 +23,13 @@ OPENSSL_PATH = ../../openssl-0.9.9d
######################################################## ########################################################
## Nothing more to do below this line! ## Nothing more to do below this line!
CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
ZLIBLIBS = zlib.lib
SSLINC = /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
CFLAGSSSL = /D "USE_SSLEAY"
LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
## Release ## Release
CCR = cl.exe /MD /O2 /D "NDEBUG" CCR = cl.exe /MD /O2 /D "NDEBUG"
@ -34,11 +41,11 @@ 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"
RCD = rc.exe /dCURLDEBUG=1 RCD = rc.exe /dCURLDEBUG=1
CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c CFLAGS = /I "../lib" /I "../include" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386 LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
RESFLAGS = /i "../include" RESFLAGS = /i "../include"
LINKLIBS = wsock32.lib libcurl.lib winmm.lib zlib.lib LINKLIBS = wsock32.lib libcurl.lib winmm.lib
LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib zlib.lib LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib
RELEASE_OBJS= \ RELEASE_OBJS= \
hugehelpr.obj \ hugehelpr.obj \
@ -62,13 +69,21 @@ DEBUG_OBJS= \
maind.obj \ maind.obj \
curld.res curld.res
######################
# release-zlib
!IF "$(CFG)" == "release-zlib"
CFLAGS = $(CFLAGS) $(CFLAGSZLIB)
LINKLIBS = $(LINKLIBS) $(ZLIBLIBS)
LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(ZLIBLIBS)
LFLAGS = $(LFLAGS) $(LFLAGSZLIB)
!ENDIF
###################### ######################
# release-ssl # release-ssl
!IF "$(CFG)" == "release-ssl" !IF "$(CFG)" == "release-ssl"
LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32" CFLAGS = $(CFLAGS) $(CFLAGSSSL)
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
CFLAGS = $(CFLAGS) -DUSE_SSLEAY
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS) $(SSLLIBS)
LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS) LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS)
LFLAGS = $(LFLAGS) $(LFLAGSSSL) LFLAGS = $(LFLAGS) $(LFLAGSSSL)
@ -78,14 +93,22 @@ LFLAGS = $(LFLAGS) $(LFLAGSSSL)
# release-libcurl-ssl-dll # release-libcurl-ssl-dll
!IF "$(CFG)" == "release-libcurl-ssl-dll" !IF "$(CFG)" == "release-libcurl-ssl-dll"
LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32" CFLAGS = $(CFLAGS) $(CFLAGSSSL)
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
CFLAGS = $(CFLAGS) -DUSE_SSLEAY
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS) $(SSLLIBS)
LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS) LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS)
LFLAGS = $(LFLAGS) $(LFLAGSSSL) LFLAGS = $(LFLAGS) $(LFLAGSSSL)
!ENDIF !ENDIF
######################
# release-ssl-zlib
!IF "$(CFG)" == "release-ssl-zlib"
CFLAGS = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB)
LINKLIBS = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBS)
LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS) $(ZLIBLIBS)
LFLAGS = $(LFLAGS) $(LFLAGSSSL) $(LFLAGSZLIB)
!ENDIF
all : release all : release