浏览代码

Z991239-1528 #comment other: 解决编译失败问题

陈礼鹏80274480 4 年之前
父节点
当前提交
dcf4df07e5
共有 2 个文件被更改,包括 4 次插入5 次删除
  1. 3 2
      Other/CMakeLists.txt
  2. 1 3
      Other/libvideocapture/CMakeLists.txt

+ 3 - 2
Other/CMakeLists.txt

@@ -10,12 +10,13 @@ add_subdirectory(libbizchan)
 add_subdirectory(libsharememory)
 add_subdirectory(libaudioqueue)
 add_subdirectory(libvideoqueue)
+add_subdirectory(libaudioframework)
+add_subdirectory(libvideoframework)
+
 if(MSVC)
    add_subdirectory(libimgplayer)
    add_subdirectory(libwmpplayer)
-   add_subdirectory(libaudioframework)
    add_subdirectory(libaudiorender)
-   add_subdirectory(libvideoframework)
    add_subdirectory(libvideohorflip)
 else(MSVC)
    add_subdirectory(libpictureplayer)

+ 1 - 3
Other/libvideocapture/CMakeLists.txt

@@ -14,8 +14,6 @@ set(${MODULE_PREFIX}_SRCS
 	ivideocaptureinterface.cpp
 	libvideocapture.h
 	libvideocapture.cpp
-#	../rvcmediacommon/common_video/videoutil.h
-#	../rvcmediacommon/common_video/videoutil.c
 )
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
@@ -26,7 +24,7 @@ conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/dynamic
+conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/shared
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 endif(WIN32)