Commit 8fd676f7 authored by Gisle Vanem's avatar Gisle Vanem
Browse files

MSVC with static link must define CURL_STATICLIB. 

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

src/Makefile.vc6

+6 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
PROGRAM_NAME = curl.exe



!IFNDEF ZLIB_PATH

ZLIB_PATH = ../../zlib-1.1.4

ZLIB_PATH = ../../zlib-1.2.1

!ENDIF



!IFNDEF OPENSSL_PATH
@@ -73,7 +73,7 @@ DEBUG_OBJS= \ 
# release-zlib



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

CFLAGS = $(CFLAGS) $(CFLAGSZLIB)

CFLAGS = $(CFLAGS) $(CFLAGSZLIB) /DCURL_STATICLIB

LINKLIBS = $(LINKLIBS) $(ZLIBLIBS)

LINKLIBS_DEBUG = $(LINKLIBS_DEBUG) $(ZLIBLIBS)

LFLAGS = $(LFLAGS) $(LFLAGSZLIB)
@@ -83,7 +83,7 @@ LFLAGS = $(LFLAGS) $(LFLAGSZLIB) 
# release-ssl



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

CFLAGS = $(CFLAGS) $(CFLAGSSSL)

CFLAGS = $(CFLAGS) $(CFLAGSSSL) /DCURL_STATICLIB

LINKLIBS  = $(LINKLIBS) $(SSLLIBS)

LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)

LFLAGS = $(LFLAGS) $(LFLAGSSSL)