moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

schannel: Updated mingw32 makefiles

This commit is contained in:
Guenter Knauf 2012-04-13 13:17:57 +02:00 committed by Daniel Stenberg
parent 64dc957a41
commit 0bb5ff5d1a
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Makefile.m32
View File

@ -115,6 +115,11 @@ endif
ifeq ($(findstring -ipv6,$(CFG)),-ipv6)
IPV6 = 1
endif
ifeq ($(findstring -schannel,$(CFG)),-schannel)
SCHANNEL = 1
SSPI = 1
SSL = 1
endif
INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL
@ -136,6 +141,9 @@ ifdef SSH2
DLL_LIBS += -L"$(LIBSSH2_PATH)/win32" -lssh2
endif
ifdef SSL
ifdef SCHANNEL
CFLAGS += -DUSE_SSL -DUSE_SCHANNEL
else
ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
@ -163,6 +171,7 @@ ifdef SSL
-DCURL_WANTS_CA_BUNDLE_ENV
DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
endif
endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"
CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H

9
src/Makefile.m32
View File

@ -123,6 +123,11 @@ endif
ifeq ($(findstring -metalink,$(CFG)),-metalink)
METALINK = 1
endif
ifeq ($(findstring -schannel,$(CFG)),-schannel)
SCHANNEL = 1
SSPI = 1
SSL = 1
endif
INCLUDES = -I. -I.. -I../include -I../lib
@ -151,6 +156,9 @@ ifdef SSH2
curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2
endif
ifdef SSL
ifdef SCHANNEL
CFLAGS += -DUSE_SSL -DUSE_SCHANNEL
else
ifndef OPENSSL_LIBPATH
OPENSSL_LIBS = -lssl -lcrypto
ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out"
@ -169,6 +177,7 @@ ifdef SSL
CFLAGS += -DUSE_SSLEAY
curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
endif
endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"
CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H