diff options
| author | Guenter Knauf <lists@gknw.net> | 2013-07-08 17:46:15 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2013-07-08 17:46:15 +0200 |
| commit | aff245b360444b11f47c1d04246cc45ef81e5de3 (patch) | |
| tree | 52c951772674f17316881b940822d86a1b46a1c6 /src | |
| parent | e01469907a1b0a1d6e5f649e7e5bba113bb235f4 (diff) | |
| download | curl-aff245b360444b11f47c1d04246cc45ef81e5de3.tar.gz | |
Added winssl-zlib target to VC builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.vc6 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index ada265f24..48331de24 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -100,6 +100,9 @@ SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32" SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll"
SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib
+WINSSL_CFLAGS = /DUSE_SCHANNEL
+#WINSSL_LIBS = gdi32.lib user32.lib
+
# Runtime library configuration
RTLIB = /MD
RTLIBD = /MDd
@@ -276,6 +279,16 @@ LFLAGS = $(LFLAGS) $(SSL_LFLAGS) $(ZLIB_LFLAGS) !ENDIF
#################################################
+# release static library with winssl and zlib
+
+!IF "$(CFG)" == "release-winssl-zlib"
+CFLAGS = $(CFLAGS) $(WINSSL_CFLAGS) $(ZLIB_CFLAGS) /DCURL_STATICLIB
+LINKLIBS = $(LIBCURL_STA_LIB_REL) $(WINSSL_LIBS) $(ZLIB_LIBS)
+LINKLIBS_DEBUG = $(LIBCURL_STA_LIB_DBG) $(WINSSL_LIBS) $(ZLIB_LIBS)
+LFLAGS = $(LFLAGS) $(WINSSL_LFLAGS) $(ZLIB_LFLAGS)
+!ENDIF
+
+#################################################
# release static library with dynamic ssl
!IF "$(CFG)" == "release-ssl-dll"
|