Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile.m32: allow -nghttp3/-ngtcp2 without -ssl [ci skip] #9314

Closed
wants to merge 1 commit into from
Closed

Makefile.m32: allow -nghttp3/-ngtcp2 without -ssl [ci skip] #9314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 14 additions & 12 deletions docs/examples/Makefile.m32
View file
Open in desktop
Expand Up @@ -275,21 +275,23 @@ ifdef SSH2
endif
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"
ifdef NGTCP2_LIBS
curl_LDADD += $(NGTCP2_LIBS)
else
curl_LDADD += -lngtcp2 -lngtcp2_crypto_openssl
ifdef NGHTTP3
CFLAGS += -DUSE_NGHTTP3
curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3
ifdef NGTCP2
CFLAGS += -DUSE_NGTCP2
curl_LDADD += -L"$(NGTCP2_PATH)/lib"
ifdef NGTCP2_LIBS
curl_LDADD += $(NGTCP2_LIBS)
else
curl_LDADD += -lngtcp2
ifdef SSL
curl_LDADD += -lngtcp2_crypto_openssl
endif
endif
endif

endif
ifdef SSL
ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
Expand Down
30 changes: 16 additions & 14 deletions lib/Makefile.m32
View file
Open in desktop
Expand Up @@ -291,23 +291,25 @@ ifdef SSH2
endif
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"
ifdef NGTCP2_LIBS
DLL_LIBS += $(NGTCP2_LIBS)
else
DLL_LIBS += -lngtcp2 -lngtcp2_crypto_openssl
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"
ifdef NGTCP2_LIBS
DLL_LIBS += $(NGTCP2_LIBS)
else
DLL_LIBS += -lngtcp2
ifdef SSL
DLL_LIBS += -lngtcp2_crypto_openssl
endif
endif
endif

endif
ifdef SSL
ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
Expand Down
26 changes: 14 additions & 12 deletions src/Makefile.m32
View file
Open in desktop
Expand Up @@ -303,21 +303,23 @@ ifdef SSH2
endif
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"
ifdef NGTCP2_LIBS
curl_LDADD += $(NGTCP2_LIBS)
else
curl_LDADD += -lngtcp2 -lngtcp2_crypto_openssl
ifdef NGHTTP3
CFLAGS += -DUSE_NGHTTP3
curl_LDADD += -L"$(NGHTTP3_PATH)/lib" -lnghttp3
ifdef NGTCP2
CFLAGS += -DUSE_NGTCP2
curl_LDADD += -L"$(NGTCP2_PATH)/lib"
ifdef NGTCP2_LIBS
curl_LDADD += $(NGTCP2_LIBS)
else
curl_LDADD += -lngtcp2
ifdef SSL
curl_LDADD += -lngtcp2_crypto_openssl
endif
endif
endif

endif
ifdef SSL
ifndef OPENSSL_INCLUDE
ifeq "$(wildcard $(OPENSSL_PATH)/outinc)" "$(OPENSSL_PATH)/outinc"
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
Expand Down