Merge branch 'bugfix/ssl_dependent' into 'refactor'

feat(ssl): Make current openssl wrap enabled when using mbedTLS

See merge request sdk/ESP8266_RTOS_SDK!62
This commit is contained in:
Wu Jian Gang
2018-04-12 18:15:40 +08:00

View File

@ -1,15 +1,16 @@
# #
# Component Makefile # Component Makefile
# #
ifdef CONFIG_SSL_USING_MBEDTLS
COMPONENT_ADD_INCLUDEDIRS := openssl/include COMPONENT_ADD_INCLUDEDIRS := openssl/include
COMPONENT_PRIV_INCLUDEDIRS := openssl/include/internal openssl/include/openssl openssl/include/platform COMPONENT_PRIV_INCLUDEDIRS := openssl/include/internal openssl/include/openssl openssl/include/platform
COMPONENT_SRCDIRS := openssl/source/library openssl/source/platform COMPONENT_SRCDIRS := openssl/source/library openssl/source/platform
ifdef CONFIG_SSL_USING_MBEDTLS
COMPONENT_ADD_INCLUDEDIRS += mbedtls/include COMPONENT_ADD_INCLUDEDIRS += mbedtls/include
COMPONENT_SRCDIRS += mbedtls/source/library mbedtls/source/platform COMPONENT_SRCDIRS += mbedtls/source/library mbedtls/source/platform
else else
COMPONENT_ADD_INCLUDEDIRS += axtls/include COMPONENT_ADD_INCLUDEDIRS := axtls/include
COMPONENT_SRCDIRS += axtls/source/ssl axtls/source/crypto COMPONENT_SRCDIRS := axtls/source/ssl axtls/source/crypto
endif endif