diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2004-11-12 11:48:02 +0000 |
|---|---|---|
| committer | Gisle Vanem <gvanem@broadpark.no> | 2004-11-12 11:48:02 +0000 |
| commit | 8fd676f73ece2cd34ac25e0d4b568da7d280b897 (patch) | |
| tree | 1c2c4a6e6bbdcbebe43213ca7f4333b13b5bfca4 /src | |
| parent | 98a8103a3b1e58d1493249805ffa4fa1cc1abc81 (diff) | |
MSVC with static link must define CURL_STATICLIB.
zlib path set to same as in lib/Makefile.vc6.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.vc6 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 34f6f62b2..0f0bb6240 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -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)
|