Merge branch 'feature/redefine_wolfssl_file_folder_structure' into 'master'

feat(wolfssl): Redefine wolfssl file folder structure See merge request sdk/ESP8266_RTOS_SDK!152
2025-05-21 00:56:38 +08:00 · 2018-05-15 11:55:33 +08:00
parent a2f1a78b92 1d27285767
commit 90fe9d2088
10 changed files with 2 additions and 2 deletions
--- a/components/ssl/CMakeLists.txt
+++ b/components/ssl/CMakeLists.txt
@ -1,6 +1,6 @@

 if(CONFIG_SSL_USING_WOLFSSL)
-set(COMPONENT_ADD_INCLUDEDIRS include wolfssl/include)
+set(COMPONENT_ADD_INCLUDEDIRS include wolfssl/include wolfssl/wolfssl)
 else()
 if(CONFIG_SSL_USING_MBEDTLS)
 set(COMPONENT_ADD_INCLUDEDIRS
--- a/components/ssl/component.mk
+++ b/components/ssl/component.mk
@ -3,7 +3,7 @@
 #

 ifdef CONFIG_SSL_USING_WOLFSSL
-COMPONENT_ADD_INCLUDEDIRS := wolfssl/include
+COMPONENT_ADD_INCLUDEDIRS := wolfssl/include wolfssl/wolfssl

 WOLFSSLLIB = wolfssl
 COMPONENT_ADD_LDFLAGS     := -L $(COMPONENT_PATH)/wolfssl/lib -lwolfssl
--- a/components/ssl/wolfssl/wolfssl/wolfssl/ssl.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/ssl.h
--- a/components/ssl/wolfssl/wolfssl/wolfssl/version.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/version.h
--- a/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/logging.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/logging.h
--- a/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/settings.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/settings.h
--- a/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/types.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/types.h
--- a/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/visibility.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/visibility.h
--- a/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/wc_port.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/wc_port.h
--- a/components/ssl/wolfssl/wolfssl/wolfssl/wolfio.h
+++ b/components/ssl/wolfssl/wolfssl/wolfssl/wolfio.h