Z991239-5337 #comment audioframework编译失败问题修复

Module/mod_sipphone/CMakeLists.txt

@@ -1,20 +1,8 @@
 define_module("sipphone")
 
-if(RVC_DEBUG_MODE)
-    set(STRMBASE_LIB strmbasd)
-	set(SPBASE_LIB spbased)
-	set(TOOLKIT_LIB libtoolkitd)
-	set(RVCCOMM_LIB RVCCommD)
-else()
-    set(STRMBASE_LIB strmbase)
-	set(SPBASE_LIB spbase)
-	set(TOOLKIT_LIB libtoolkit)
-	set(RVCCOMM_LIB RVCComm)
-endif(RVC_DEBUG_MODE)
-
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
+set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
 
 if(MSVC)
     set(STDAFXCPP stdafx.cpp)

Other/libaudiomgr/CMakeLists.txt

@@ -1,13 +1,7 @@
 set(MODULE_NAME "audiomgr")
 set(MODULE_PREFIX "LIB_AUDIOMGR_FUNC")
 
-
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
-
+set(SPBASE_LIB spbase)
 
 if(MSVC)
 set(${MODULE_PREFIX}_SRCS

Other/unix/libaudioframework/CMakeLists.txt

@@ -2,13 +2,8 @@ set(MODULE_NAME "libaudioframework")
 set(MODULE_PREFIX "LIB_AUDIOFRAMEWORK_FUNC")
 add_compile_options(-fPIC)
 
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-	set(RVCCOMM_LIB RVCCommD)
-else()
-    set(SPBASE_LIB spbase)
-	set(RVCCOMM_LIB RVCComm)
-endif(RVC_DEBUG_MODE)
+set(SPBASE_LIB spbase)
+set(RVCCOMM_LIB RVCComm)
 
 if(MSVC)
 	set(${NOUSE}_SRCS

Other/unix/libaudioqueue/CMakeLists.txt

@@ -1,13 +1,6 @@
 set(MODULE_NAME "audioqueue")
 set(MODULE_PREFIX "LIB_AUDIOQUEUE_FUNC")
 
-
-#if(RVC_DEBUG_MODE)
-#    set(SPBASE_LIB spbased)
-#else()
-#    set(SPBASE_LIB spbase)
-#endif(RVC_DEBUG_MODE)
-
 if(MSVC)
     set(STDAFXCPP stdafx.cpp)
 else()

Other/unix/libvideocapture/CMakeLists.txt

@@ -1,12 +1,7 @@
 set(MODULE_NAME "videocapture")
 set(MODULE_PREFIX "LIB_VIDEOCAPTURE_FUNC")
 
-
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
+set(SPBASE_LIB spbase)
 
 if(MSVC)
 set(${MODULE_PREFIX}_SRCS

Other/unix/libvideoframework/CMakeLists.txt

@@ -2,11 +2,7 @@ set(MODULE_NAME "libvideoframework")
 set(MODULE_PREFIX "LIB_VIDEOFRAMEWORK_FUNC")
 add_compile_options(-fPIC)
 
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
+set(SPBASE_LIB spbase)
 
 if(MSVC)
 	set(${VIDEONOUSE}_SRCS

Other/unix/libvideoqueue/CMakeLists.txt

@@ -1,13 +1,6 @@
 set(MODULE_NAME "videoqueue")
 set(MODULE_PREFIX "LIB_VIDEOQUEUE_FUNC")
 
-
-#if(RVC_DEBUG_MODE)
-#    set(SPBASE_LIB spbased)
-#else()
-#    set(SPBASE_LIB spbase)
-#endif(RVC_DEBUG_MODE)
-
 if(MSVC)
     set(STDAFXCPP stdafx.cpp)
 else()

Other/unix/libvideorender/CMakeLists.txt

@@ -1,13 +1,7 @@
 set(MODULE_NAME "videorender")
 set(MODULE_PREFIX "LIB_VIDEORENDER_FUNC")
 
-
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
-
+set(SPBASE_LIB spbase)
 
 set(${MODULE_PREFIX}_SRCS
     ivideorenderinterface.h

Other/win/libaudioframework/CMakeLists.txt

@@ -4,13 +4,9 @@ if(NOT MSVC)
 add_compile_options(-fPIC)
 endif(NOT MSVC)
 
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-	set(RVCCOMM_LIB RVCCommD)
-else()
-    set(SPBASE_LIB spbase)
-	set(RVCCOMM_LIB RVCComm)
-endif(RVC_DEBUG_MODE)
+#local target
+set(SPBASE_LIB spbase)
+set(RVCCOMM_LIB RVCComm)
 
 
 set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
@@ -66,6 +62,7 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
 if(WIN32)
 target_include_directories(${MODULE_NAME} PRIVATE 
 	${RVC_COMMON_INCLUDE_DIR}
+	${RVC_WINPR_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}/common

Other/win/libvideoframework/CMakeLists.txt

@@ -3,11 +3,7 @@ set(MODULE_PREFIX "LIB_VIDEOFRAMEWORK_FUNC")
 
 add_definitions(-D__STDC_CONSTANT_MACROS)
 
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
+set(SPBASE_LIB spbase)
 
 if(MSVC)
 	set(${VIDEONOUSE}_SRCS

Other/win/libvideorender/CMakeLists.txt

@@ -1,13 +1,7 @@
 set(MODULE_NAME "videorender")
 set(MODULE_PREFIX "LIB_VIDEORENDER_FUNC")
 
-
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
-
+set(SPBASE_LIB spbase)
 
 set(${MODULE_PREFIX}_SRCS
     ivideorenderinterface.h