moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00
Code Issues Releases Wiki Activity

MSVC with static link must define CURL_STATICLIB.

Browse Source 
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
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.vc6
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
@ -29,7 +29,7 @@ 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
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
## Release
CCR = cl.exe /MD /O2 /D "NDEBUG"
@ -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)
@ -81,9 +81,9 @@ 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)
@ -101,7 +101,7 @@ LFLAGS = $(LFLAGS) $(LFLAGSSSL)
######################
# release-ssl-zlib
!IF "$(CFG)" == "release-ssl-zlib"
CFLAGS = $(CFLAGS) $(CFLAGSSSL) $(CFLAGSZLIB)
LINKLIBS = $(LINKLIBS) $(SSLLIBS) $(ZLIBLIBS)