Massimiliano Ziccardi's updates for the VC6 makefiles

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index ceb3fe01c71cbcfdd865c29e5581966f5addb296..9fc4849409af3cfaeb08ef01e980938998b07c97 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -39,12 +39,17 @@ CCNODBG   = cl.exe /MD /O2 /D "NDEBUG"
 CCDEBUG   = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ\r
 CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
 CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"\r
-CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"\r
-\r
+CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS" \r
 LNKDLL    = link.exe /DLL  /def:libcurl.def\r
 LNKLIB    = link.exe /lib\r
 LFLAGS    = /nologo\r
 SSLLIBS   = libeay32.lib ssleay32.lib\r
+!IFDEF USEMM_LIBS\r
+WINLIBS   = wsock32.lib winmm.lib\r
+!ELSE\r
+WINLIBS   = wsock32.lib \r
+CFLAGS         = $(CFLAGS) /D "WITHOUT_MM_LIB"\r
+!ENDIF\r
 #  RSAglue.lib was formerly needed in the SSLLIBS\r
 CFGSET    = FALSE\r
 \r
@@ -90,7 +95,7 @@ CFGSET   = TRUE
 TARGET   =$(LIB_NAME).dll\r
 DIROBJ   =.\$(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"\r
-LNK      = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
+LNK      = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"\r
 CC       = $(CCNODBG)  $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r
@@ -98,7 +103,6 @@ RESOURCE = $(DIROBJ)\libcurl.res
 \r
 ######################\r
 # release-ssl-zlib\r
-\r
 !IF "$(CFG)" == "release-ssl-zlib"\r
 TARGET   =$(LIB_NAME).lib\r
 DIROBJ   =.\$(CFG)\r
@@ -115,7 +119,7 @@ CFGSET   = TRUE
 TARGET   =$(LIB_NAME).lib\r
 DIROBJ   =.\$(CFG)\r
 LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"\r
-LNK      = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)\r
+LNK      = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)\r
 CC       = $(CCNODBG)  $(CFLAGSSSL)\r
 CFGSET   = TRUE\r
 RESOURCE = $(DIROBJ)\libcurl.res\r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 847e67b13947ad0af97cc551e95a21c0312ebb64..aa6a7765fccc2d51f37d1fa3adcd62c7ad870551 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -42,6 +42,8 @@ RELEASE_OBJS= \
        urlglobr.obj \\r
        getpassr.obj \\r
        homedirr.obj \\r
+       timevalr.obj \\r
+       strtoofftr.obj \\r
        mainr.obj \\r
        curlr.res\r
 \r
@@ -51,6 +53,8 @@ DEBUG_OBJS= \
        urlglobd.obj \\r
        getpassd.obj \\r
        homedird.obj \\r
+       timevald.obj \\r
+       strtoofftd.obj \\r
        maind.obj \\r
        curld.res\r
        \r
@@ -69,6 +73,22 @@ LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
 !ENDIF\r
 \r
+######################\r
+# release-libcurl-ssl-dll\r
+\r
+!IF "$(CFG)" == "release-libcurl-ssl-dll"\r
+!IFNDEF OPENSSL_PATH\r
+OPENSSL_PATH   = ../../openssl-0.9.7a\r
+!ENDIF\r
+LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
+SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib \r
+CFLAGS = $(CFLAGS) -DUSE_SSLEAY\r
+LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
+LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
+LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
+!ENDIF\r
+\r
+\r
 all : release\r
 \r
 release: $(RELEASE_OBJS)\r
@@ -88,6 +108,10 @@ getpassr.obj: getpass.c
        $(CCR) $(CFLAGS) /Fo"$@" getpass.c\r
 homedirr.obj: homedir.c\r
        $(CCR) $(CFLAGS) /Fo"$@" homedir.c\r
+timevalr.obj: ../lib/timeval.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" ../lib/timeval.c\r
+strtoofftr.obj: ../lib/strtoofft.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
 mainr.obj: main.c\r
        $(CCR) $(CFLAGS) /Fo"$@" main.c\r
 curlr.res : curl.rc\r
@@ -104,6 +128,10 @@ getpassd.obj: getpass.c
        $(CCD) $(CFLAGS) /Fo"$@" getpass.c\r
 homedird.obj: homedir.c\r
        $(CCD) $(CFLAGS) /Fo"$@" homedir.c\r
+timevald.obj: timeval.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" timeval.c\r
+strtoofftd.obj: ../lib/strtoofft.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
 maind.obj: main.c\r
        $(CCD) $(CFLAGS) /Fo"$@" main.c\r
 curld.res : curl.rc\r