aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViktor Szakats <vszakats@users.noreply.github.com>2017-08-30 10:44:50 +0000
committerViktor Szakats <vszakats@users.noreply.github.com>2017-08-30 10:44:50 +0000
commitc86e21b624570e498e71d7d35c82b7ff193104c7 (patch)
tree0dbc4bd4e3ede0eacb92cb333325871671dc0cf3 /src
parent29c2bdee93e1d41306ec2cef34ab19fd0e6519ac (diff)
makefile.m32: add multissl support
Closes https://github.com/curl/curl/pull/1840
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.m3216
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 53de5c6eb..e55427a5e 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1999 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -168,9 +168,7 @@ ZLIB = 1
endif
ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
SSH2 = 1
-ifneq ($(findstring -winssl,$(CFG)),-winssl)
SSL = 1
-endif
ZLIB = 1
endif
ifeq ($(findstring -ssl,$(CFG)),-ssl)
@@ -206,6 +204,11 @@ NGHTTP2 = 1
endif
INCLUDES = -I. -I../include -I../lib
+ifdef SSL
+ ifdef WINSSL
+ CFLAGS += -DCURL_WITH_MULTI_SSL
+ endif
+endif
ifdef DYN
curl_DEPENDENCIES = $(PROOT)/lib/libcurldll.a $(PROOT)/lib/libcurl.dll
@@ -274,11 +277,11 @@ ifdef SSL
INCLUDES += -I"$(OPENSSL_INCLUDE)"
CFLAGS += -DUSE_OPENSSL
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
-else
+endif
ifdef WINSSL
+ CFLAGS += -DUSE_SCHANNEL
curl_LDADD += -lcrypt32
endif
-endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"
CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
@@ -307,9 +310,6 @@ ifdef METALINK
endif
ifdef SSPI
CFLAGS += -DUSE_WINDOWS_SSPI
- ifdef WINSSL
- CFLAGS += -DUSE_SCHANNEL
- endif
endif
ifdef IPV6
CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501