sync submodule idfv4.0

pull/139/head
XiaochaoGONG 2020-03-31 11:37:25 +08:00
parent 618b69f6e4
commit 86623ba27f
4 changed files with 11 additions and 8 deletions

View File

@ -36,7 +36,10 @@ before_script:
- source esp-idf/tools/ci/configure_ci_environment.sh - source esp-idf/tools/ci/configure_ci_environment.sh
# fetch the submodules (& if necessary re-fetch repo) from gitlab # fetch the submodules (& if necessary re-fetch repo) from gitlab
- time ./esp-idf/tools/ci/get-full-sources.sh - time git submodule update --init --recursive
- ./esp-idf/install.sh
- . ./esp-idf/export.sh
.add_gitlab_key_before: .add_gitlab_key_before:

View File

@ -12,9 +12,9 @@ target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib")
target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/wake_word_engine") target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/wake_word_engine")
target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/acoustic_algorithm") target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/acoustic_algorithm")
target_link_libraries(${COMPONENT_TARGET} target_link_libraries(${COMPONENT_TARGET}
dl_lib_sr
c_speech_features
wakenet
hilexin_wn5
esp_audio_processor esp_audio_processor
) hilexin_wn5
wakenet
c_speech_features
dl_lib_sr
)

@ -1 +1 @@
Subproject commit 463a9d8b7f9af8205222b80707f9bdbba7c530e1 Subproject commit 57a5a486ffc5e5e61eb7b69e3456f4cebdb24a63

View File

@ -40,7 +40,7 @@
#include "mbedtls/aes.h" #include "mbedtls/aes.h"
#include "mbedtls/dhm.h" #include "mbedtls/dhm.h"
#include "mbedtls/md5.h" #include "mbedtls/md5.h"
#include "rom/crc.h" #include "esp32/rom/crc.h"
/* wechat Includes */ /* wechat Includes */
#include "wechat_blufi.h" #include "wechat_blufi.h"