重构编译脚本

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})
 # 设置链接库路径

buildtools

@@ -1 +1 @@
-Subproject commit b613bface153bc31adc4b005c5031d954049b1cd
+Subproject commit 1002bbf5bc4d0b816d33e776d505b708e90b0f3b

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

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"