MSVC with static link must define CURL_STATICLIB.

zlib path set to same as in lib/Makefile.vc6.

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 34f6f62b259abcf7096b2fc7aa6231d6bb639f5c..0f0bb62409e6884f88c6bca5ae78662530969cd9 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -14,7 +14,7 @@
 PROGRAM_NAME = curl.exe\r
 \r
 !IFNDEF ZLIB_PATH\r
-ZLIB_PATH = ../../zlib-1.1.4\r
+ZLIB_PATH = ../../zlib-1.2.1\r
 !ENDIF\r
 \r
 !IFNDEF OPENSSL_PATH\r
@@ -29,7 +29,7 @@ ZLIBLIBS   = zlib.lib
 SSLINC     = /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
 CFLAGSSSL  = /D "USE_SSLEAY"\r
 LFLAGSSSL  = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
-SSLLIBS    = libeay32.lib ssleay32.lib gdi32.lib \r
+SSLLIBS    = libeay32.lib ssleay32.lib gdi32.lib\r
 \r
 ## Release\r
 CCR = cl.exe /MD /O2 /D "NDEBUG"\r
@@ -73,7 +73,7 @@ DEBUG_OBJS= \
 # release-zlib\r
 \r
 !IF "$(CFG)" == "release-zlib"\r
-CFLAGS = $(CFLAGS) $(CFLAGSZLIB)\r
+CFLAGS = $(CFLAGS) $(CFLAGSZLIB) /DCURL_STATICLIB\r
 LINKLIBS = $(LINKLIBS) $(ZLIBLIBS)\r
 LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(ZLIBLIBS)\r
 LFLAGS = $(LFLAGS) $(LFLAGSZLIB)\r
@@ -81,9 +81,9 @@ LFLAGS = $(LFLAGS) $(LFLAGSZLIB)
 \r
 ######################\r
 # release-ssl\r
- \r
+\r
 !IF "$(CFG)" == "release-ssl"\r
-CFLAGS = $(CFLAGS) $(CFLAGSSSL)\r
+CFLAGS = $(CFLAGS) $(CFLAGSSSL) /DCURL_STATICLIB\r
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
 LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
@@ -101,7 +101,7 @@ LFLAGS = $(LFLAGS) $(LFLAGSSSL)
 \r
 ######################\r
 # release-ssl-zlib\r
- \r
+\r
 !IF "$(CFG)" == "release-ssl-zlib"\r
 CFLAGS = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB)\r
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBS)\r