diff options
Diffstat (limited to 'lib/Makefile.m32')
| -rw-r--r-- | lib/Makefile.m32 | 58 |
1 files changed, 53 insertions, 5 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 37887eed5..d78614da3 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -5,11 +5,11 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1999 - 2021, 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 -# are also available at https://curl.haxx.se/docs/copyright.html. +# are also available at https://curl.se/docs/copyright.html. # # You may opt to use, copy, modify, merge, publish, distribute and/or sell # copies of the Software, and permit persons to whom the Software is @@ -59,6 +59,10 @@ endif ifndef LIBRTMP_PATH LIBRTMP_PATH = ../../librtmp-2.4 endif +# Edit the path below to point to the base of your libgsasl package. +ifndef LIBGSASL_PATH +LIBGSASL_PATH = ../../libgsasl-1.10.0 +endif # Edit the path below to point to the base of your libidn2 package. ifndef LIBIDN2_PATH LIBIDN2_PATH = ../../libidn2-2.0.3 @@ -77,6 +81,14 @@ endif ifndef NGHTTP2_PATH NGHTTP2_PATH = ../../nghttp2-1.0.0 endif +# Edit the path below to point to the base of your nghttp3 package. +ifndef NGHTTP3_PATH +NGHTTP3_PATH = ../../nghttp3-1.0.0 +endif +# Edit the path below to point to the base of your ngtcp2 package. +ifndef NGTCP2_PATH +NGTCP2_PATH = ../../ngtcp2-1.0.0 +endif PROOT = .. @@ -167,12 +179,10 @@ SYNC = 1 endif ifeq ($(findstring -rtmp,$(CFG)),-rtmp) RTMP = 1 -SSL = 1 ZLIB = 1 endif ifeq ($(findstring -ssh2,$(CFG)),-ssh2) SSH2 = 1 -SSL = 1 ZLIB = 1 endif ifeq ($(findstring -ssl,$(CFG)),-ssl) @@ -190,6 +200,9 @@ endif ifeq ($(findstring -brotli,$(CFG)),-brotli) BROTLI = 1 endif +ifeq ($(findstring -gsasl,$(CFG)),-gsasl) +GSASL = 1 +endif ifeq ($(findstring -idn2,$(CFG)),-idn2) IDN2 = 1 endif @@ -212,6 +225,22 @@ endif ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2) NGHTTP2 = 1 endif +ifeq ($(findstring -nghttp3,$(CFG)),-nghttp3) +NGHTTP3 = 1 +endif +ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2) +NGTCP2 = 1 +endif +ifeq ($(findstring -unicode,$(CFG)),-unicode) +UNICODE = 1 +endif + +# SSH2 and RTMP require an SSL library; assume OpenSSL if none specified +ifneq ($(SSH2)$(RTMP),) + ifeq ($(SSL)$(WINSSL),) + SSL = 1 + endif +endif INCLUDES = -I. -I../include CFLAGS += -DBUILDING_LIBCURL @@ -220,6 +249,9 @@ ifdef SSL CFLAGS += -DCURL_WITH_MULTI_SSL endif endif +ifdef UNICODE + CFLAGS += -DUNICODE -D_UNICODE +endif ifdef SYNC CFLAGS += -DUSE_SYNC_DNS @@ -252,6 +284,17 @@ ifdef SSH2 endif endif ifdef SSL + ifdef NGHTTP3 + INCLUDES += -I"$(NGHTTP3_PATH)/include" + CFLAGS += -DUSE_NGHTTP3 + DLL_LIBS += -L"$(NGHTTP3_PATH)/lib" -lnghttp3 + ifdef NGTCP2 + INCLUDES += -I"$(NGTCP2_PATH)/include" + CFLAGS += -DUSE_NGTCP2 + DLL_LIBS += -L"$(NGTCP2_PATH)/lib" -lngtcp2 -lngtcp2_crypto_openssl + endif + endif + ifndef OPENSSL_INCLUDE ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc" OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc @@ -261,7 +304,7 @@ ifdef SSL endif endif ifneq "$(wildcard $(OPENSSL_INCLUDE)/openssl/opensslv.h)" "$(OPENSSL_INCLUDE)/openssl/opensslv.h" - $(error Invalid path to OpenSSL package: $(OPENSSL_PATH)) + $(error Invalid path to OpenSSL package: $(OPENSSL_PATH)) endif ifndef OPENSSL_LIBPATH ifeq "$(wildcard $(OPENSSL_PATH)/out)" "$(OPENSSL_PATH)/out" @@ -315,6 +358,11 @@ ifdef BROTLI DLL_LIBS += -lbrotlidec endif endif +ifdef GSASL + INCLUDES += -I"$(LIBGSASL_PATH)/include" + CFLAGS += -DUSE_GSASL + DLL_LIBS += -L"$(LIBGSASL_PATH)/lib" -lgsasl +endif ifdef IDN2 INCLUDES += -I"$(LIBIDN2_PATH)/include" CFLAGS += -DUSE_LIBIDN2 |