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

makefile.m32: add multissl support

Browse Source 
Closes https://github.com/curl/curl/pull/1840
This commit is contained in:
Viktor Szakats 2017-08-30 10:44:50 +00:00
parent 29c2bdee93
commit c86e21b624
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Makefile.m32
View File

@ -153,9 +153,7 @@ ZLIB = 1
endif endif
ifeq ($(findstring -ssh2,$(CFG)),-ssh2) ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
SSH2 = 1 SSH2 = 1
ifneq ($(findstring -winssl,$(CFG)),-winssl)
SSL = 1 SSL = 1
endif
ZLIB = 1 ZLIB = 1
endif endif
ifeq ($(findstring -ssl,$(CFG)),-ssl) ifeq ($(findstring -ssl,$(CFG)),-ssl)
@ -192,6 +190,11 @@ endif
INCLUDES = -I. -I../include INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL CFLAGS += -DBUILDING_LIBCURL
ifdef SSL
ifdef WINSSL
CFLAGS += -DCURL_WITH_MULTI_SSL
endif
endif
ifdef SYNC ifdef SYNC
CFLAGS += -DUSE_SYNC_DNS CFLAGS += -DUSE_SYNC_DNS
@ -257,10 +260,10 @@ ifdef SSL
CFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP CFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP
endif endif
endif endif
else
ifdef WINSSL
DLL_LIBS += -lcrypt32
endif endif
ifdef WINSSL
CFLAGS += -DUSE_SCHANNEL
DLL_LIBS += -lcrypt32
endif endif
ifdef ZLIB ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)" INCLUDES += -I"$(ZLIB_PATH)"
@ -280,9 +283,6 @@ endif
endif endif
ifdef SSPI ifdef SSPI
CFLAGS += -DUSE_WINDOWS_SSPI CFLAGS += -DUSE_WINDOWS_SSPI
ifdef WINSSL
CFLAGS += -DUSE_SCHANNEL
endif
endif endif
ifdef SPNEGO ifdef SPNEGO
CFLAGS += -DHAVE_SPNEGO CFLAGS += -DHAVE_SPNEGO

18
src/Makefile.m32
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -168,9 +168,7 @@ ZLIB = 1
endif endif
ifeq ($(findstring -ssh2,$(CFG)),-ssh2) ifeq ($(findstring -ssh2,$(CFG)),-ssh2)
SSH2 = 1 SSH2 = 1
ifneq ($(findstring -winssl,$(CFG)),-winssl)
SSL = 1 SSL = 1
endif
ZLIB = 1 ZLIB = 1
endif endif
ifeq ($(findstring -ssl,$(CFG)),-ssl) ifeq ($(findstring -ssl,$(CFG)),-ssl)
@ -206,6 +204,11 @@ NGHTTP2 = 1
endif endif
INCLUDES = -I. -I../include -I../lib INCLUDES = -I. -I../include -I../lib
ifdef SSL
ifdef WINSSL
CFLAGS += -DCURL_WITH_MULTI_SSL
endif
endif
ifdef DYN ifdef DYN
curl_DEPENDENCIES = $(PROOT)/lib/libcurldll.a $(PROOT)/lib/libcurl.dll curl_DEPENDENCIES = $(PROOT)/lib/libcurldll.a $(PROOT)/lib/libcurl.dll
@ -274,10 +277,10 @@ ifdef SSL
INCLUDES += -I"$(OPENSSL_INCLUDE)" INCLUDES += -I"$(OPENSSL_INCLUDE)"
CFLAGS += -DUSE_OPENSSL CFLAGS += -DUSE_OPENSSL
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
else
ifdef WINSSL
curl_LDADD += -lcrypt32
endif endif
ifdef WINSSL
CFLAGS += -DUSE_SCHANNEL
curl_LDADD += -lcrypt32
endif endif
ifdef ZLIB ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)" INCLUDES += -I"$(ZLIB_PATH)"
@ -307,9 +310,6 @@ ifdef METALINK
endif endif
ifdef SSPI ifdef SSPI
CFLAGS += -DUSE_WINDOWS_SSPI CFLAGS += -DUSE_WINDOWS_SSPI
ifdef WINSSL
CFLAGS += -DUSE_SCHANNEL
endif
endif endif
ifdef IPV6 ifdef IPV6
CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501 CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501