From 3f49108b72797ef6083f6492856f0cbedda50714 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 24 Mar 2023 10:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=BC=96=E8=AF=91=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt   | 18 +-----------------
 buildtools       |  2 +-
 sh/envsetup.sh   |  3 ++-
 sh/envsetuppc.sh |  2 ++
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e389b6..0dad4c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,23 +54,7 @@ include(dep/zlinuxcomponents/audio/module.cmake)
 include(dep/zlinuxcomponents/aiui_ws/module.cmake)
 
 # 设置当前工程依赖的头文件路径和链接的库文件
-set(DEP_LINK_LIBRARIES
-    ${DEP_LINK_LIBRARIES}
-    # ffmpeg
-    avcodec
-    avdevice
-    avfilter
-    avformat
-    avutil
-    swresample
-    swscale
-    m
-    # sys
-    asound
-    pthread
-    ${PUBLIC_LINK_LIBS}
-    # curlpp curl
-)
+set(DEP_LINK_LIBRARIES ${DEP_LINK_LIBRARIES} pthread m ${PUBLIC_LINK_LIBS})
 # 设置头文件路径
 set(PUBLIC_INCLUDE_DIRECTORIES ${PUBLIC_INCLUDE_DIRECTORIES})
 # 设置链接库路径
diff --git a/buildtools b/buildtools
index b613bfa..1002bbf 160000
--- a/buildtools
+++ b/buildtools
@@ -1 +1 @@
-Subproject commit b613bface153bc31adc4b005c5031d954049b1cd
+Subproject commit 1002bbf5bc4d0b816d33e776d505b708e90b0f3b
diff --git a/sh/envsetup.sh b/sh/envsetup.sh
index b3c25aa..4a3da39 100755
--- a/sh/envsetup.sh
+++ b/sh/envsetup.sh
@@ -11,7 +11,6 @@ mkdir -p ${LIBSDIR}
 cd ${LIBSDIR}
 
 # 下载依赖库
-
 # CONFIG_SUPPORT_ALSA
 if [ "$CONFIG_SUPPORT_ALSA" = true ]; then
     wget -c "192.168.1.2:8021/sdk_firefly_rk3328_v2.5.1/buildtools/libasound2_dev1.1.3-5ubuntu0.6.tar.gz"
@@ -36,6 +35,7 @@ if [ "$CONFIG_SUPPORT_ALSA" = true ]; then
 
     PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/alsa/lib"
     PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/alsa/include"
+    PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};asound"
 fi
 
 # CONFIG_SUPPORT_FFMPEG
@@ -46,6 +46,7 @@ if [ "$CONFIG_SUPPORT_FFMPEG" = true ]; then
     mv ffmpeg-4.1.10-aarch64-20230301 ${LIBSDIR}/ffmpeg
     PUBLIC_LINK_DIRECTORIES="${PUBLIC_LINK_DIRECTORIES};${LIBSDIR}/ffmpeg/lib"
     PUBLIC_INCLUDE_DIRECTORIES="${PUBLIC_INCLUDE_DIRECTORIES};${LIBSDIR}/ffmpeg/include"
+    PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};avcodec;avdevice;avfilter;avformat;avutil;swresample;swscale"
 fi
 
 # CONFIG_SUPPORT_IFLYTOP_VOICE_PROCESS
diff --git a/sh/envsetuppc.sh b/sh/envsetuppc.sh
index e69de29..2d350e2 100755
--- a/sh/envsetuppc.sh
+++ b/sh/envsetuppc.sh
@@ -0,0 +1,2 @@
+PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};asound"
+PUBLIC_LINK_LIBS="${PUBLIC_LINK_LIBS};avcodec;avdevice;avfilter;avformat;avutil;swresample;swscale"