From 8c215ab64c9d291323f0c15ad5fca23ffcb00fed Mon Sep 17 00:00:00 2001 From: Dmitriy Gerasimov <naeper@demlabs.net> Date: Mon, 21 Jun 2021 16:07:32 +0700 Subject: [PATCH] [+] Added DAP_FEATURES param [*] SSL support moved to be optional if DAP_FEATURES contains 'ssl' --- dap-sdk/core/libdap.pri | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dap-sdk/core/libdap.pri b/dap-sdk/core/libdap.pri index e7b623806b..2d55484b6a 100755 --- a/dap-sdk/core/libdap.pri +++ b/dap-sdk/core/libdap.pri @@ -20,7 +20,13 @@ unix: !android : ! darwin { LIBS += -lrt -ljson-c -lmagic } -DEFINES += DAP_NET_CLIENT_NO_SSL + +contains(DAP_FEATURES, ssl){ + include($$PWD/../../3rdparty/wolfssl/wolfssl.pri) +}else{ + DEFINES += DAP_NET_CLIENT_NO_SSL +} + darwin { QMAKE_CFLAGS_DEBUG += -Wall -g3 -ggdb -fno-strict-aliasing DEFINES += _GNU_SOURCE @@ -47,9 +53,6 @@ win32 { HEADERS += $$PWD/../../3rdparty/uthash/src/utlist.h \ $$PWD/../../3rdparty/uthash/src/uthash.h -if(DAPSDK_MODULES MATCHES "ssl-support") - include($$PWD/../../3rdparty/wolfssl/wolfssl.pri) -endif() # Sources itself HEADERS += $$PWD/include/dap_common.h \ -- GitLab