From 12109d10dae0b85bbeb207e094b23e717d5b90b2 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 7 Mar 2023 16:07:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0zlinuxcomponents=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81AIUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- CMakeLists.txt | 15 +++++++++------ dep/zlinuxcomponents | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3dac223..1369e73 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -94,6 +94,7 @@ "unordered_set": "cpp", "rope": "cpp", "slist": "cpp", - "scoped_allocator": "cpp" + "scoped_allocator": "cpp", + "netdb.h": "c" } } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 5195755..cb8c6a2 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/dep/zlinuxcomponents b/dep/zlinuxcomponents index dd27508..f7277b5 160000 --- a/dep/zlinuxcomponents +++ b/dep/zlinuxcomponents @@ -1 +1 @@ -Subproject commit dd27508e45b7338497d2de3d46daa7544e9e45ff +Subproject commit f7277b52ca5ec37ca4de55ac44c8f2d8a5be61ae