espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-12-15 01:48:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_websocket_demo_compile_error' into 'release/v2.x.x'

Browse Source 
fix(websocket_demo): Fix websocket demo compile error

See merge request sdk/ESP8266_RTOS_SDK!72
This commit is contained in:
Wu Jian Gang
2018-04-20 14:49:32 +08:00
parent 111327ef15 397a0999a5
commit cd1e3ffa30
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -5,6 +5,8 @@ stages:
variables: variables:
GIT_STRATEGY: clone GIT_STRATEGY: clone
IDF_PATH: "$CI_PROJECT_DIR"
# before each job, we need to check if this job is filtered by bot stage/job filter # before each job, we need to check if this job is filtered by bot stage/job filter
.apply_bot_filter: &apply_bot_filter .apply_bot_filter: &apply_bot_filter
python $APPLY_BOT_FILTER_SCRIPT || exit 0 python $APPLY_BOT_FILTER_SCRIPT || exit 0

3
examples/websocket_demo/Makefile
View File

@@ -70,7 +70,8 @@ LINKFLAGS_eagle.app.v6 = \
-lphy \ -lphy \
-lpp \ -lpp \
-lsmartconfig \ -lsmartconfig \
-lssl \ -lopenssl \
-lmbedtls \
-lwpa \ -lwpa \
$(DEP_LIBS_eagle.app.v6)\ $(DEP_LIBS_eagle.app.v6)\
-Wl,--end-group -Wl,--end-group

1
examples/websocket_demo/websocket/websocket.c
View File

@@ -37,7 +37,6 @@
* info@aspl.es - http://www.aspl.es/nopoll * info@aspl.es - http://www.aspl.es/nopoll
*/ */
#include <nopoll/nopoll.h> #include <nopoll/nopoll.h>
#include "ssl_compat-1.0.h"
#include "esp_common.h" #include "esp_common.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"