--- Makefile.vc6 2004-07-14 16:17:52.000000000 +0200
+++ Makefile.vc6.new 2004-10-06 19:05:14.000000000 +0200
@@ -14,22 +14,24 @@
 PROGRAM_NAME = curl.exe

 !IFNDEF ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.1.4
+ZLIB_PATH = ../../zlib-1.2.1
 !ENDIF

 !IFNDEF OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.9d
+OPENSSL_PATH = ../../openssl-0.9.7d
 !ENDIF

 ########################################################
 ## 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
+CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I
"$(ZLIB_PATH)"
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+ZLIBLIBS = zlib.lib
+ZLIBLIBSDLL = zdll.lib
+SSLINC = /I "$(OPENSSL_PATH)/inc32" /I
"$(OPENSSL_PATH)/inc32/openssl"
+CFLAGSSSL = /D "USE_SSLEAY"
+LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
+LFLAGSSSLDLL = /LIBPATH:"$(OPENSSL_PATH)/out32dll"
+SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib

 ## Release
 CCR = cl.exe /MD /O2 /D "NDEBUG"
@@ -70,6 +72,16 @@
         curld.res

 ######################
+# release-ssl
+
+!IF "$(CFG)" == "release-ssl"
+CFLAGS = $(CFLAGS) $(CFLAGSSSL)
+LINKLIBS = $(LINKLIBS) $(SSLLIBS)
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS)
+LFLAGS = $(LFLAGS) $(LFLAGSSSL)
+!ENDIF
+
+######################
 # release-zlib

 !IF "$(CFG)" == "release-zlib"
@@ -80,33 +92,43 @@
 !ENDIF

 ######################
-# release-ssl
+# release-ssl-zlib

-!IF "$(CFG)" == "release-ssl"
+!IF "$(CFG)" == "release-ssl-zlib"
+CFLAGS = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB)
+LINKLIBS = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBS)
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS) $(ZLIBLIBS)
+LFLAGS = $(LFLAGS) $(LFLAGSSSL) $(LFLAGSZLIB)
+!ENDIF
+
+######################
+# release-ssl-dll
+
+!IF "$(CFG)" == "release-ssl-dll"
 CFLAGS = $(CFLAGS) $(CFLAGSSSL)
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS)
-LFLAGS = $(LFLAGS) $(LFLAGSSSL)
+LFLAGS = $(LFLAGS) $(LFLAGSSSLDLL)
 !ENDIF

 ######################
-# release-libcurl-ssl-dll
+# release-zlib-dll

-!IF "$(CFG)" == "release-libcurl-ssl-dll"
-CFLAGS = $(CFLAGS) $(CFLAGSSSL)
-LINKLIBS = $(LINKLIBS) $(SSLLIBS)
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS)
-LFLAGS = $(LFLAGS) $(LFLAGSSSL)
+!IF "$(CFG)" == "release-zlib-dll"
+CFLAGS = $(CFLAGS) $(CFLAGSZLIB)
+LINKLIBS = $(LINKLIBS) $(ZLIBLIBSDLL)
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(ZLIBLIBSDLL)
+LFLAGS = $(LFLAGS) $(LFLAGSZLIB)
 !ENDIF

 ######################
-# release-ssl-zlib
+# release-ssl-dll-zlib-dll

-!IF "$(CFG)" == "release-ssl-zlib"
+!IF "$(CFG)" == "release-ssl-dll-zlib-dll"
 CFLAGS = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB)
-LINKLIBS = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBS)
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS) $(ZLIBLIBS)
-LFLAGS = $(LFLAGS) $(LFLAGSSSL) $(LFLAGSZLIB)
+LINKLIBS = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBSDLL)
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(SSLLIBS) $(ZLIBLIBSDLL)
+LFLAGS = $(LFLAGS) $(LFLAGSSSLDLL) $(LFLAGSZLIB)
 !ENDIF

Samuel Díaz García
Director Gerente
ArcosCom Wireless, S.L.L.

mailto:samueldg_at_arcoscom.com
http://www.arcoscom.com
móvil: 651 93 72 48
tlfn/fax: 956 70 13 15

-----Mensaje original-----
De: Samuel Díaz García (ArcosCom) [mailto:samueldg_at_arcoscom.com]
Enviado el: miércoles, 06 de octubre de 2004 14:52
Para: samueldg_at_arcoscom.com; 'libcurl development'
Asunto: RE: Modifications into Makefile.vc6 [patch] - Corrections

Please, don't apply diffs, I'm still working on all VC6 makefiles (curl,
libcurl and the root makefile - in VC6 targets - ) to allow more usefull
configs.

Regards,

Samuel Díaz García
Director Gerente
ArcosCom Wireless, S.L.L.

mailto:samueldg_at_arcoscom.com
http://www.arcoscom.com
móvil: 651 93 72 48
tlfn/fax: 956 70 13 15

-----Mensaje original-----
De: curl-library-bounces_at_cool.haxx.se
[mailto:curl-library-bounces_at_cool.haxx.se]En nombre de Samuel Díaz
García (ArcosCom)
Enviado el: miércoles, 06 de octubre de 2004 12:58
Para: 'libcurl development'
Asunto: RE: Modifications into Makefile.vc6 [patch]

--- makefile.vc6.bak 2004-07-14 16:17:52.000000000 +0200
+++ makefile.vc6 2004-10-06 11:16:32.000000000 +0200
@@ -48,6 +48,7 @@
 LNKLIB = link.exe /lib
 LFLAGS = /nologo
 SSLLIBS = libeay32.lib ssleay32.lib
+ZLIBLIBS = zdll.lib
 !IFDEF USEMM_LIBS
 WINLIBS = wsock32.lib winmm.lib
 !ELSE
@@ -86,7 +87,7 @@
 !IF "$(CFG)" == "release-dll"
 TARGET =$(LIB_NAME).dll
 DIROBJ =.\$(CFG)
-LNK = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
+LNK = $(LNKDLL) $(WINLIBS) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
 CC = $(CCNODBG)
 CFGSET = TRUE
 RESOURCE = $(DIROBJ)\libcurl.res
@@ -118,6 +119,86 @@
 !ENDIF

 ######################
+# release-dll-ssl-dll
+
+!IF "$(CFG)" == "release-dll-ssl-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET)
/IMPLIB:"$(LIB_NAME).lib"
+CC = $(CCNODBG) $(CFLAGSSSL)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# release-dll-zlib-dll
+
+!IF "$(CFG)" == "release-dll-zlib-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKDLL) $(ZLIBLIBS) $(WINLIBS) $(LFLAGSZLIB) /out:$(TARGET)
/IMPLIB:"$(LIB_NAME).lib"
+CC = $(CCNODBG) $(CFLAGSZLIB)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# release-dll-ssl-dll-zlib-dll
+
+!IF "$(CFG)" == "release-dll-ssl-dll-zlib-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKDLL) $(SSLLIBS) $(ZLIBLIBS) $(WINLIBS) $(LFLAGSSSL)
$(LFLAGSZLIB) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
+CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# debug-dll-ssl-dll
+
+!IF "$(CFG)" == "debug-dll-ssl-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /DEBUG
/out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
+CC = $(CCDEBUG) $(CFLAGSSSL)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# debug-dll-zlib-dll
+
+!IF "$(CFG)" == "debug-dll-zlib-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKDLL) $(ZLIBLIBS) $(WINLIBS) $(LFLAGSZLIB) /DEBUG
/out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
+CC = $(CCDEBUG) $(CFLAGSZLIB)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# debug-dll-ssl-dll-zlib-dll
+
+!IF "$(CFG)" == "debug-dll-ssl-dll-zlib-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKDLL) $(SSLLIBS) $(ZLIBLIBS) $(WINLIBS) $(LFLAGSSSL)
$(LFLAGSZLIB) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
/PDB:"$(LIB_NAME_DEBUG).pdb"
+CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
 # release-ssl-zlib
 !IF "$(CFG)" == "release-ssl-zlib"
 TARGET =$(LIB_NAME).lib
@@ -212,12 +293,18 @@
 !MESSAGE release-ssl - release static library with ssl
 !MESSAGE release-ssl-zlib - release static library with ssl and zlib
 !MESSAGE release-ssl-dll - release dll library with ssl
-!MESSAGE release-libcurl-ssl-dll - static libcurl with shared ssl
+!MESSAGE release-libcurl-ssl-dll - static libcurl with shared ssl
+!MESSAGE release-dll-ssl-dll - release dll library with dynamic
ssl
+!MESSAGE release-dll-zlib-dll - release dll library with dynamic
zlib1
+!MESSAGE release-dll-ssl-dll-zlib-dll - release dll library with dynamic
ssl and dynamic zlib
 !MESSAGE debug - debug static library
 !MESSAGE debug-dll - debug dll
 !MESSAGE debug-zlib - debug static library with zlib
 !MESSAGE debug-ssl - debug static library with ssl
 !MESSAGE debug-ssl-dll - debug dll library with ssl
+!MESSAGE debug-dll-ssl-dll - debug dll library with dynamic ssl
+!MESSAGE debug-dll-zlib-dll - debug dll library with dynamic
zlib1
+!MESSAGE debug-dll-ssl-dll-zlib-dll - debug dll library with dynamic ssl
and dynamic zlib
 !MESSAGE <target> can be left blank in which case all is assumed
 !ERROR please choose a valid configuration "$(CFG)"
 !ENDIF
@@ -294,11 +381,17 @@

 debug-dll\libcurl.res \
 debug-ssl-dll\libcurl.res \
+debug-dll-ssl-dll\libcurl.res \
+debug-dll-zlib-dll\libcurl.res \
+debug-dll-ssl-dll-zlib-dll\libcurl.res \
 release-libcurl-ssl-dll\libcurl.res: libcurl.rc
         rc /dCURLDEBUG=1 /Fo $@ libcurl.rc

 release-dll\libcurl.res \
 release-ssl-dll\libcurl.res \
+release-dll-ssl-dll\libcurl.res \
+release-dll-zlib-dll\libcurl.res \
+release-dll-ssl-dll-zlib-dll\libcurl.res \
 release-libcurl-ssl-dll\libcurl.res: libcurl.rc
         rc /dCURLDEBUG=0 /Fo $@ libcurl.rc

Samuel Díaz García
Director Gerente
ArcosCom Wireless, S.L.L.

mailto:samueldg_at_arcoscom.com
http://www.arcoscom.com
móvil: 651 93 72 48
tlfn/fax: 956 70 13 15
Received on 2004-10-06