From 28687ae271892cc195e0a54fe8b5704e42345d37 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 6 Oct 2022 21:34:37 +0000 Subject: [PATCH] cmake: fix enabling websocket support Follow-up from 664249d095275ec532f55dd1752d80c8c1093a77 Closes #9660 --- lib/Makefile.m32 | 8 +++++--- lib/curl_config.h.cmake | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index c76565874d..8807828a79 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -107,7 +107,7 @@ endif # comments below about exceptions). Always include them anyway to match # behavior of other build systems. -# Linker options to exclude for shared mode executables: +# Linker options to exclude for shared mode executables. _LDFLAGS := _LIBS := @@ -152,6 +152,7 @@ ifneq ($(findstring -nghttp3,$(CFG)),) CPPFLAGS += -I"$(NGHTTP3_PATH)/include" _LDFLAGS += -L"$(NGHTTP3_PATH)/lib" _LIBS += -lnghttp3 + NGTCP2_PATH ?= $(PROOT)/../ngtcp2 CPPFLAGS += -DUSE_NGTCP2 CPPFLAGS += -I"$(NGTCP2_PATH)/include" @@ -165,14 +166,15 @@ ifneq ($(findstring -ssl,$(CFG)),) CPPFLAGS += -DUSE_OPENSSL CPPFLAGS += -DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG OPENSSL_INCLUDE ?= $(OPENSSL_PATH)/include - CPPFLAGS += -I"$(OPENSSL_INCLUDE)" OPENSSL_LIBPATH ?= $(OPENSSL_PATH)/lib + CPPFLAGS += -I"$(OPENSSL_INCLUDE)" _LDFLAGS += -L"$(OPENSSL_LIBPATH)" OPENSSL_LIBS ?= -lssl -lcrypto _LIBS += $(OPENSSL_LIBS) + ifneq ($(findstring -srp,$(CFG)),) ifneq ($(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h),) - # OpenSSL 1.0.1 and later, except BoringSSL + # OpenSSL 1.0.1 and later. CPPFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP endif endif diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 59d2381318..3f7eb3c5db 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -786,3 +786,6 @@ ${SIZEOF_TIME_T_CODE} /* to make the compiler know the prototypes of Windows IDN APIs */ #cmakedefine WANT_IDN_PROTOTYPES 1 + +/* Define to 1 to enable websocket support. */ +#cmakedefine USE_WEBSOCKETS 1 -- 2.47.3