1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00

MSVC with static link must define CURL_STATICLIB.

zlib path set to same as in lib/Makefile.vc6.
This commit is contained in:
Gisle Vanem 2004-11-12 11:48:02 +00:00
parent 98a8103a3b
commit 8fd676f73e

View File

@ -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)