Set OpenSSL path to same as in ../lib/Makefile.vc6.

Import lib is now "libcurl_imp.lib".
Some cleanup and making it more readable.

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 0f0bb62..513b982 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -18,34 +18,33 @@ ZLIB_PATH = ../../zlib-1.2.1
 !ENDIF\r
 \r
 !IFNDEF OPENSSL_PATH\r
-OPENSSL_PATH = ../../openssl-0.9.9d\r
+OPENSSL_PATH = ../../openssl-0.9.7d\r
 !ENDIF\r
 \r
 ########################################################\r
 ## Nothing more to do below this line!\r
-CFLAGSZLIB = /D "HAVE_ZLIB_H" /D "HAVE_ZLIB" /D "HAVE_LIBZ" /I "$(ZLIB_PATH)"\r
+CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"\r
 LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
 ZLIBLIBS   = zlib.lib\r
 SSLINC     = /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
-CFLAGSSSL  = /D "USE_SSLEAY"\r
+CFLAGSSSL  = /DUSE_SSLEAY\r
 LFLAGSSSL  = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
 SSLLIBS    = libeay32.lib ssleay32.lib gdi32.lib\r
 \r
 ## Release\r
-CCR = cl.exe /MD /O2 /D "NDEBUG"\r
-LINKR = link.exe /incremental:no /libpath:"../lib"\r
-RCR = rc.exe /dCURLDEBUG=0\r
+CCR   = cl.exe /MD /O2 /DNDEBUG\r
+LINKR = link.exe /incremental:no /libpath:../lib\r
+RCR   = rc.exe /dCURLDEBUG=0\r
 \r
 ## Debug\r
-CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ\r
-LINKD = link.exe /incremental:yes /debug /libpath:"../lib"\r
-RCD = rc.exe /dCURLDEBUG=1\r
+CCD   = cl.exe /MDd /Gm /ZI /Od /D_DEBUG /GZ\r
+LINKD = link.exe /incremental:yes /debug /libpath:../lib\r
+RCD   = rc.exe /dCURLDEBUG=1\r
+\r
+CFLAGS   = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c\r
+LFLAGS   = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386\r
+RESFLAGS = /i../include\r
 \r
-CFLAGS = /I "../lib" /I "../include" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:I386\r
-RESFLAGS = /i "../include"\r
-LINKLIBS = wsock32.lib libcurl.lib winmm.lib\r
-LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib\r
 \r
 RELEASE_OBJS= \\r
        hugehelpr.obj \\r
@@ -69,46 +68,58 @@ DEBUG_OBJS= \
        maind.obj \\r
        curld.res\r
 \r
-######################\r
-# release-zlib\r
+#################################################\r
+# release-zlib (static libcurl + zlib)\r
 \r
 !IF "$(CFG)" == "release-zlib"\r
-CFLAGS = $(CFLAGS) $(CFLAGSZLIB) /DCURL_STATICLIB\r
-LINKLIBS = $(LINKLIBS) $(ZLIBLIBS)\r
-LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(ZLIBLIBS)\r
-LFLAGS = $(LFLAGS) $(LFLAGSZLIB)\r
+CFLAGS         = $(CFLAGS) $(CFLAGSZLIB) /DCURL_STATICLIB\r
+LINKLIBS       = libcurl.lib  $(ZLIBLIBS)\r
+LINKLIBS_DEBUG = libcurld.lib $(ZLIBLIBS)\r
+LFLAGS         = $(LFLAGS) $(LFLAGSZLIB)\r
 !ENDIF\r
 \r
-######################\r
-# release-ssl\r
+#################################################\r
+# release-ssl (static libcurl + ssl)\r
 \r
 !IF "$(CFG)" == "release-ssl"\r
-CFLAGS = $(CFLAGS) $(CFLAGSSSL) /DCURL_STATICLIB\r
-LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
-LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
-LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
+CFLAGS         = $(CFLAGS) $(CFLAGSSSL) /DCURL_STATICLIB\r
+LINKLIBS       = libcurl.lib  $(SSLLIBS)\r
+LINKLIBS_DEBUG = libcurld.lib $(SSLLIBS)\r
+LFLAGS         = $(LFLAGS) $(LFLAGSSSL)\r
 !ENDIF\r
 \r
-######################\r
-# release-libcurl-ssl-dll\r
+#################################################\r
+# release-libcurl-ssl-dll (libcurl.dll + ssl)\r
 \r
 !IF "$(CFG)" == "release-libcurl-ssl-dll"\r
-CFLAGS = $(CFLAGS) $(CFLAGSSSL)\r
-LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
-LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
-LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
+CFLAGS         = $(CFLAGS) $(CFLAGSSSL)\r
+LINKLIBS       = libcurl_imp.lib  $(SSLLIBS)\r
+LINKLIBS_DEBUG = libcurld_imp.lib $(SSLLIBS)\r
+LFLAGS         = $(LFLAGS) $(LFLAGSSSL)\r
 !ENDIF\r
 \r
-######################\r
-# release-ssl-zlib\r
+#################################################\r
+# release-ssl-zlib (static libcurl +  ssl + zlib)\r
 \r
 !IF "$(CFG)" == "release-ssl-zlib"\r
-CFLAGS = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB)\r
-LINKLIBS  = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBS)\r
-LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS) $(ZLIBLIBS)\r
-LFLAGS = $(LFLAGS) $(LFLAGSSSL) $(LFLAGSZLIB)\r
+CFLAGS         = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB) /DCURL_STATICLIB\r
+LINKLIBS       = libcurl.lib  $(SSLLIBS) $(ZLIBLIBS)\r
+LINKLIBS_DEBUG = libcurld.lib $(SSLLIBS) $(ZLIBLIBS)\r
+LFLAGS         = $(LFLAGS) $(LFLAGSSSL) $(LFLAGSZLIB)\r
 !ENDIF\r
 \r
+#################################################\r
+# If CFG not specified, use static libs\r
+\r
+!IF "$(CFG)." == "."\r
+CFLAGS         = $(CFLAGS) /DCURL_STATICLIB\r
+LINKLIBS       = libcurl.lib\r
+LINKLIBS_DEBUG = libcurld.lib\r
+!ENDIF\r
+\r
+\r
+LINKLIBS       = $(LINKLIBS) wsock32.lib winmm.lib\r
+LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) wsock32.lib winmm.lib\r
 \r
 all : release\r
 \r