curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-20 02:52:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.m32: add support for HTTP/3 via ngtcp2+nghttp3

Browse Source 
Approved-by: Daniel Stenberg
Closes #6092
This commit is contained in:
Viktor Szakats 2020-10-16 07:15:19 +00:00
parent c5ff3fb2cd
commit 769c9a4eec
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docs/examples/Makefile.m32
View File

@ -89,6 +89,14 @@ endif
ifndef NGHTTP2_PATH ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../../nghttp2-1.0.0 NGHTTP2_PATH = ../../../nghttp2-1.0.0
endif 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 = ../.. PROOT = ../..
@ -215,6 +223,12 @@ endif
ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2) ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
NGHTTP2 = 1 NGHTTP2 = 1
endif 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 INCLUDES = -I. -I$(PROOT) -I$(PROOT)/include -I$(PROOT)/lib
@ -252,6 +266,15 @@ ifdef SSH2
endif endif
endif endif
ifdef SSL 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 ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc" ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc

25
lib/Makefile.m32
View File

@ -77,6 +77,14 @@ endif
ifndef NGHTTP2_PATH ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-1.0.0 NGHTTP2_PATH = ../../nghttp2-1.0.0
endif 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 = .. PROOT = ..
@ -212,6 +220,12 @@ endif
ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2) ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
NGHTTP2 = 1 NGHTTP2 = 1
endif endif
ifeq ($(findstring -nghttp3,$(CFG)),-nghttp3)
NGHTTP3 = 1
endif
ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2)
NGTCP2 = 1
endif
INCLUDES = -I. -I../include INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL CFLAGS += -DBUILDING_LIBCURL
@ -252,6 +266,17 @@ ifdef SSH2
endif endif
endif endif
ifdef SSL 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 ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc" ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc

23
src/Makefile.m32
View File

@ -89,6 +89,14 @@ endif
ifndef NGHTTP2_PATH ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-1.0.0 NGHTTP2_PATH = ../../nghttp2-1.0.0
endif 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 = .. PROOT = ..
@ -224,6 +232,12 @@ endif
ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2) ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
NGHTTP2 = 1 NGHTTP2 = 1
endif endif
ifeq ($(findstring -nghttp3,$(CFG)),-nghttp3)
NGHTTP3 = 1
endif
ifeq ($(findstring -ngtcp2,$(CFG)),-ngtcp2)
NGTCP2 = 1
endif
INCLUDES = -I. -I../include -I../lib INCLUDES = -I. -I../include -I../lib
ifdef SSL ifdef SSL
@ -270,6 +284,15 @@ ifdef SSH2
endif endif
endif endif
ifdef SSL 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 ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc" ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc