diff options
| author | Viktor Szakats <commit@vsz.me> | 2020-10-16 07:15:19 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2020-10-16 07:15:19 +0000 |
| commit | 769c9a4eecba87c366ae8490ceeb9a02c5c6813e (patch) | |
| tree | 9a4996f071b76debffa7112ddae303891cadce33 | |
| parent | c5ff3fb2cd12e64212560366f923412ce0b89fde (diff) | |
| download | curl-769c9a4eecba87c366ae8490ceeb9a02c5c6813e.tar.gz | |
Makefile.m32: add support for HTTP/3 via ngtcp2+nghttp3
Approved-by: Daniel Stenberg
Closes #6092
| -rw-r--r-- | docs/examples/Makefile.m32 | 23 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 25 | ||||
| -rw-r--r-- | src/Makefile.m32 | 23 |
3 files changed, 71 insertions, 0 deletions
diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index a2dca6bbc..57d100dd7 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -89,6 +89,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 = ../.. @@ -215,6 +223,12 @@ 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 INCLUDES = -I. -I$(PROOT) -I$(PROOT)/include -I$(PROOT)/lib @@ -252,6 +266,15 @@ ifdef SSH2 endif endif ifdef SSL + ifdef NGHTTP3 + CFLAGS += -DUSE_NGHTTP3 + curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3 + ifdef NGTCP2 + CFLAGS += -DUSE_NGTCP2 + curl_LDADD += -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 diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 37887eed5..dcb0b8801 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -77,6 +77,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 = .. @@ -212,6 +220,12 @@ 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 INCLUDES = -I. -I../include CFLAGS += -DBUILDING_LIBCURL @@ -252,6 +266,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 diff --git a/src/Makefile.m32 b/src/Makefile.m32 index b3fcae5cf..f535d7632 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -89,6 +89,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 = .. @@ -224,6 +232,12 @@ 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 INCLUDES = -I. -I../include -I../lib ifdef SSL @@ -270,6 +284,15 @@ ifdef SSH2 endif endif ifdef SSL + ifdef NGHTTP3 + CFLAGS += -DUSE_NGHTTP3 + curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3 + ifdef NGTCP2 + CFLAGS += -DUSE_NGTCP2 + curl_LDADD += -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 |