Browse Source

更新zlinuxcomponents,支持AIUI

master
zhaohe 2 years ago
parent
commit
12109d10da
  1. 3
      .vscode/settings.json
  2. 15
      CMakeLists.txt
  3. 2
      dep/zlinuxcomponents

3
.vscode/settings.json

@ -94,6 +94,7 @@
"unordered_set": "cpp",
"rope": "cpp",
"slist": "cpp",
"scoped_allocator": "cpp"
"scoped_allocator": "cpp",
"netdb.h": "c"
}
}

15
CMakeLists.txt

@ -51,6 +51,7 @@ include(dep/zlinuxcomponents/alsaplayer/module.cmake)
include(dep/zlinuxcomponents/rootfs_auto_update/module.cmake)
include(dep/zlinuxcomponents/mycroft_precise/module.cmake)
include(dep/zlinuxcomponents/audio/module.cmake)
include(dep/zlinuxcomponents/aiui_ws/module.cmake)
#
set(DEP_LINK_LIBRARIES
@ -68,10 +69,11 @@ set(DEP_LINK_LIBRARIES
asound
pthread
#
curlpp
curl)
set(PUBLIC_INCLUDE_DIRECTORIES ${PUBLIC_INCLUDE_DIRECTORIES} ./libs/curlpp/include)
set(PUBLIC_LINK_DIRECTORIES ${PUBLIC_LINK_DIRECTORIES} ./libs/curlpp/lib)
# curlpp curl
)
# set(PUBLIC_INCLUDE_DIRECTORIES ${PUBLIC_INCLUDE_DIRECTORIES}
# ./libs/curlpp/include) set(PUBLIC_LINK_DIRECTORIES ${PUBLIC_LINK_DIRECTORIES}
# ./libs/curlpp/lib)
#
zadd_executable_simple(
@ -88,10 +90,11 @@ zadd_executable_simple(
src/service/voiceprocess/beforeasr_voiceprocesser.cpp
src/service/voiceprocess/beforewakeup_voiceprocesser.cpp
src/service/voiceprocess/voiceprocess_service.cpp
src/service/voiceprocess/wakeup_processer.cpp)
src/service/voiceprocess/wakeup_processer.cpp
#aiui
)
zadd_executable_simple(TARGET alsaplayer_main.out SRC
dep/zlinuxcomponents/alsaplayer/alsaplayer_main.cpp)
zadd_executable_simple(TARGET audio_recorder_main.out SRC
dep/zlinuxcomponents/audio/audio_recorder_main.cpp)
zadd_executable_simple(TARGET curlpptest_main.out SRC src/curlpptest_main.cpp)

2
dep/zlinuxcomponents

@ -1 +1 @@
Subproject commit dd27508e45b7338497d2de3d46daa7544e9e45ff
Subproject commit f7277b52ca5ec37ca4de55ac44c8f2d8a5be61ae
Loading…
Cancel
Save