Commit f6319bd7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Massimiliano Ziccardi's updates for the VC6 makefiles

parent 0912015a

lib/Makefile.vc6

+9 −5
Original line number Diff line number Diff line
@@ -40,11 +40,16 @@ CCDEBUG = cl.exe /MDd /Od /Gm /Zi /D "_DEBUG" /GZ 
CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"

CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"

CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS" 



LNKDLL    = link.exe /DLL  /def:libcurl.def

LNKLIB    = link.exe /lib

LFLAGS    = /nologo

SSLLIBS   = libeay32.lib ssleay32.lib

!IFDEF USEMM_LIBS

WINLIBS   = wsock32.lib winmm.lib

!ELSE

WINLIBS   = wsock32.lib 

CFLAGS		= $(CFLAGS) /D "WITHOUT_MM_LIB"

!ENDIF

#  RSAglue.lib was formerly needed in the SSLLIBS

CFGSET    = FALSE
@@ -90,7 +95,7 @@ CFGSET = TRUE 
TARGET   =$(LIB_NAME).dll

DIROBJ   =.\$(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"

LNK      = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"

LNK      = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"

CC       = $(CCNODBG)  $(CFLAGSSSL)

CFGSET   = TRUE

RESOURCE = $(DIROBJ)\libcurl.res
@@ -98,7 +103,6 @@ RESOURCE = $(DIROBJ)\libcurl.res 


######################

# release-ssl-zlib



!IF "$(CFG)" == "release-ssl-zlib"

TARGET   =$(LIB_NAME).lib

DIROBJ   =.\$(CFG)
@@ -115,7 +119,7 @@ CFGSET = TRUE 
TARGET   =$(LIB_NAME).lib

DIROBJ   =.\$(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"

LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)

LNK      = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)

CC       = $(CCNODBG)  $(CFLAGSSSL)

CFGSET   = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

src/Makefile.vc6

+28 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ RELEASE_OBJS= \ 
	urlglobr.obj \

	getpassr.obj \

	homedirr.obj \

	timevalr.obj \

	strtoofftr.obj \

	mainr.obj \

	curlr.res
@@ -51,6 +53,8 @@ DEBUG_OBJS= \ 
	urlglobd.obj \

	getpassd.obj \

	homedird.obj \

	timevald.obj \

	strtoofftd.obj \

	maind.obj \

	curld.res
@@ -69,6 +73,22 @@ LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS) 
LFLAGS = $(LFLAGS) $(LFLAGSSSL)

!ENDIF



######################

# release-libcurl-ssl-dll



!IF "$(CFG)" == "release-libcurl-ssl-dll"

!IFNDEF OPENSSL_PATH

OPENSSL_PATH   = ../../openssl-0.9.7a

!ENDIF

LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"

SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib 

CFLAGS = $(CFLAGS) -DUSE_SSLEAY

LINKLIBS  = $(LINKLIBS) $(SSLLIBS)

LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)

LFLAGS = $(LFLAGS) $(LFLAGSSSL)

!ENDIF





all : release



release: $(RELEASE_OBJS)
@@ -88,6 +108,10 @@ getpassr.obj: getpass.c 
	$(CCR) $(CFLAGS) /Fo"$@" getpass.c

homedirr.obj: homedir.c

	$(CCR) $(CFLAGS) /Fo"$@" homedir.c

timevalr.obj: ../lib/timeval.c

	$(CCR) $(CFLAGS) /Fo"$@" ../lib/timeval.c

strtoofftr.obj: ../lib/strtoofft.c

	$(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c

mainr.obj: main.c

	$(CCR) $(CFLAGS) /Fo"$@" main.c

curlr.res : curl.rc
@@ -104,6 +128,10 @@ getpassd.obj: getpass.c 
	$(CCD) $(CFLAGS) /Fo"$@" getpass.c

homedird.obj: homedir.c

	$(CCD) $(CFLAGS) /Fo"$@" homedir.c

timevald.obj: timeval.c

	$(CCR) $(CFLAGS) /Fo"$@" timeval.c

strtoofftd.obj: ../lib/strtoofft.c

	$(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c

maind.obj: main.c

	$(CCD) $(CFLAGS) /Fo"$@" main.c

curld.res : curl.rc