#IQRV #comment UOS下编译失败处理

Module/CMakeLists.txt

@@ -45,8 +45,8 @@ if(SIMULATE_ON)
     rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
 endif(SIMULATE_ON)
 
-#撖嫣� Windows 霈曄蔭摰硺�����砌縑��
-#摰帋��曹澈摨栞���
+#撖嫣� Windows 霈曄蔭摰硺�����?靽⊥�
+#摰帋��曹澈摨栞��?
 macro(add_module_libraries _module_prefix _module_name _module_version)
     
     string(STRIP ${_module_version} RAW_VERSION_STRING)
@@ -85,7 +85,7 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     endif(BUILD_MOUDLE_TEST)
 
     add_library(${_module_name} SHARED ${${_module_prefix}_SRCS} ${${_module_name}_TEST_SRCS})
-        # 霈曄蔭撌亦�颲枏枂頝臬�嚗諹��滢��� Linux �齿������ Windows �蠘��賡�鈭��甇餅暑銝滩�嚗�蘨�賡�朞��典���䲮撘讛�銵諹挽蝵�
+        # 霈曄蔭撌亦�颲枏枂頝?敺��餈蹱�雿𨅯銁 Linux �齿�����? Windows �蠘?㗇𡂝憌𦒘�嚗峕?餅暑銝滩?䕘��?�賡�朞��典���䲮撘讛�銵諹?曄蔭
     if(SIMULATE_ON)
         set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_PATH "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
         set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
@@ -94,9 +94,9 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
         # etc for the other available configuration types (MinSizeRel, RelWithDebInfo)
     endif()
 
-    # 瘛餃�撖澆枂摰誩�銋�
+    # 瘛餃�撖澆枂摰誩�銋?
     target_compile_definitions(${_module_name} PUBLIC "${_module_prefix}_EXPORTS")
-    # ���曄略頞�＆霈方����CJSON憭湔�隞嗅��函�敹���� --gifur
+    # ���曄略頞�＆霈方����CJSON憭湔�隞嗅��函�敹�?��? --gifur
     target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_INCLUDES} ${THIRD_PARTY_BASE_DIR}/Include/CJson ${OTHER_LIB_BASE_DIR}/libpublicFun)
     if(BUILD_MOUDLE_TEST)
         target_compile_definitions(${_module_name} PRIVATE "WITH_BUILD_MODULE_TEST")
@@ -107,7 +107,7 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
         target_compile_definitions(${_module_name} PRIVATE "WITH_CPPRESTSDK")
 	    target_include_directories(${_module_name} PRIVATE 
             ${CONAN_INCLUDE_DIRS_JSONCPP}
-            ${RVC_OTHER_DEPENDENIES_DIR}/libRestfulFunc)
+            ${OTHER_LIB_BASE_DIR}/libRestfulFunc)
         target_link_directories(${MODULE_NAME} PRIVATE
         	${CONAN_LIB_DIRS_JSONCPP}
         )
@@ -124,7 +124,7 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
 
 endmacro(add_module_libraries)
 
-# 霈曄蔭摰硺����鋆�鼧韐肽楝敺�
+# 霈曄蔭摰硺����鋆�鼧韐肽楝敺?
 # 撖嫣� Windows 霈曄蔭摰硺�憿寧𤌍撌亦��刻圾�單䲮獢�����
 macro(deploy_module _module_prefix _module_name)
 
@@ -219,7 +219,7 @@ add_subdirectory(mod_sipphone)
 add_subdirectory(mod_CameraConfigManage)
 
 
-# 瘙��餉�靘肽��瑁���洵銝㗇䲮摨�
+# 瘙��餉?��韏𡝗鼧韐萘�蝚?銝㗇䲮摨?
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)
 
 

Module/mod_CameraConfigManage/CMakeLists.txt

@@ -32,8 +32,14 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_OPENCV}/opencv
 	${CONAN_INCLUDE_DIRS_OPENCV}/opencv2/imgcodecs
 	${MODULE_BASE_DIR}
-    ${RVC_OTHER_DEPENDENIES_DIR}/libmediadeviceinfo
-	${RVC_OTHER_DEPENDENIES_DIR}/libaudiomgr
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
+	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudioqueue
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libmediadeviceinfo
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudiomgr
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideocapture
     ${CONAN_INCLUDE_DIRS_PORTAUDIO}
     ${CONAN_INCLUDE_DIRS_FFMPEG}
 )
@@ -62,8 +68,7 @@ else()
 		target_include_directories(${MODULE_NAME} PRIVATE
 			${CONAN_INCLUDE_DIRS_PULSEAUDIO})
 		target_link_directories(${MODULE_NAME} PRIVATE
-			${CONAN_LIB_DIRS_PULSEAUDIO})
-		target_link_directories(${MODULE_NAME} PRIVATE
+			${CONAN_LIB_DIRS_PULSEAUDIO}
 			${CONAN_LIB_DIRS_APR}
 			${CONAN_LIB_DIRS_SOFIA}
 			${CONAN_LIB_DIRS_ZLIB}

Module/mod_CameraConfigManage/mod_CameraConfigManage.vcxproj

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E5356A5-9B1D-496E-8C01-077B149B590B}</ProjectGuid>
-    <RootNamespace>mod_CameraConfigManage</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\modmake.setting" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(FrameworkHeadRoot)\libtoolkit;$(OtherHeadPath)\libvideoframework;$(OtherHeadPath)\libvideoqueue;$(OtherHeadPath)\libvideohorflip;$(OtherHeadPath)\libvideoecho;$(OtherHeadPath)\libaudioqueue;$(ModuleCommonHeadPath);$(ThirdPartyHeadRoot)\portaudio\include;$(ThirdPartyHeadRoot)\IPP;$(ThirdPartyHeadRoot)\ffmpeg_4.1\include;$(ThirdPartyHeadRoot)\opencv\include\opencv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SpBase.lib;libtoolkit.lib;avcodec.lib;avutil.lib;swscale.lib;portaudio_x86.lib;opencv_highgui230.lib;opencv_video230.lib;opencv_core230.lib;opencv_imgproc230.lib;Vfw32.lib;winmm.lib;strmiids.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(FrameworkLib);$(ThirdPartyLib);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="CameraConfigManage_client_g.h" />
-    <ClInclude Include="CameraConfigManage_def_g.h" />
-    <ClInclude Include="CameraConfigManage_msg_g.h" />
-    <ClInclude Include="CameraConfigManage_server_g.h" />
-    <ClInclude Include="Capture.h" />
-    <ClInclude Include="Event.h" />
-    <ClInclude Include="mod_CameraConfigManage.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Capture.cpp" />
-    <ClCompile Include="mod_CameraConfigManage.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Other\libaudioqueue\libaudioqueue.vcxproj">
-      <Project>{2ad3370e-8091-40a1-80ba-7db3aa809cda}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Other\libvideoecho\libvideoecho.vcxproj">
-      <Project>{b8739abb-5955-46b3-bf0c-794c7feda47c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Other\libvideoqueue\libvideoqueue.vcxproj">
-      <Project>{24312d88-f752-40c2-a1b9-a55eddd9791a}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CameraConfigManage.xml" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Module/mod_CameraConfigManage/mod_CameraConfigManage.vcxproj.filters

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="mod_CameraConfigManage.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="Event.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="Capture.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CameraConfigManage_client_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CameraConfigManage_def_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CameraConfigManage_msg_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="CameraConfigManage_server_g.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_CameraConfigManage.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="Capture.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc">
-      <Filter>资源文件</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CameraConfigManage.xml" />
-  </ItemGroup>
-</Project>

Module/mod_ContactlessCard/CMakeLists.txt

@@ -1,4 +1,4 @@
-#实体�
+#实体�
 define_module("ContactlessCard")
 
 add_definitions(-D_CRT_RAND_S)
@@ -14,7 +14,7 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 )
 

Module/mod_FingerPrint/CMakeLists.txt

@@ -1,4 +1,4 @@
-#实体�
+#实体�
 define_module("FingerPrint")
 
 file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE 
@@ -15,7 +15,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
 	${MODULE_BASE_DIR}/mod_cardswiper
 	${MODULE_BASE_DIR}/mod_BootManager
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 
 # 添加实体需��赖的其他共享库（包括系统库）

Module/mod_HSPScanner/CMakeLists.txt

@@ -11,7 +11,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
     ${CONAN_INCLUDE_DIRS_OPENCV}
     ${CONAN_INCLUDE_DIRS_OPENCV}/opencv2
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 
 set(${MODULE_PREFIX}_SYSLIBS libpublicFun)

Module/mod_IDCertificate/CMakeLists.txt

@@ -1,4 +1,4 @@
-#实体�
+#实体�
 define_module("IDCertificate")
 
 file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE 
@@ -20,7 +20,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_OPENCV}/opencv2/imgcodecs
 	${MODULE_BASE_DIR}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libimageproc
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 
 target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_BIN_DIRS_OPENCV})
@@ -70,5 +70,5 @@ target_link_libraries(${MODULE_NAME} libimageproc ${${MODULE_PREFIX}_LIBS} ${${M
 
 deploy_module(${MODULE_PREFIX} ${MODULE_NAME})
 
-# 设置��赖拷�的第三方库
+# 设置��赖拷�的�三方�
 set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)

Module/mod_SalesRecorder/CMakeLists.txt

@@ -13,6 +13,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${OTHER_LIB_BASE_DIR}
+	${OTHER_LIB_PLATFORM_BASE_DIR}
 )
 
 target_link_directories(${MODULE_NAME} PRIVATE

Module/mod_cardissuer/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${MODULE_BASE_DIR}/mod_heartbeat
 	${MODULE_BASE_DIR}/mod_guiconsole
 	${MODULE_BASE_DIR}/mod_accessauth
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 	${CONAN_INCLUDE_DIRS_OPENSSL}
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 )

Module/mod_gpio/CMakeLists.txt

@@ -18,7 +18,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}	
 	${ModuleCommonHeadPath}
 	${DevHeadPath}
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 
 target_link_directories(${MODULE_NAME} PRIVATE

Module/mod_healthmanager/CMakeLists.txt

@@ -26,7 +26,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${MODULE_BASE_DIR}/mod_ups
 	${MODULE_BASE_DIR}/mod_interactioncontext
 	${MODULE_BASE_DIR}/mod_UpgradeMgr
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 	${MODULE_BASE_DIR}/mod_CenterSetting
 	${MODULE_BASE_DIR}/mod_Initializer
 	${MODULE_BASE_DIR}/mod_accessauth
@@ -34,7 +34,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${MODULE_BASE_DIR}/mod_CameraConfigManage #for header file
 	${MODULE_BASE_DIR}/mod_chromium
 	${MODULE_BASE_DIR}/mod_ResourceWatcher
-	${RVC_OTHER_DEPENDENIES_DIR}/libRestfulFunc
+	${OTHER_LIB_BASE_DIR}/libRestfulFunc
 	${MODULE_MICRO_SERVICES_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 )

Module/mod_mediacontroller/CMakeLists.txt

@@ -39,6 +39,7 @@ endif(WIN32)
 if(NOT WIN32)
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
+	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
@@ -47,35 +48,23 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libmediadeviceinfo
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudiomgr
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideocapture
-
 )
-target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
-	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
-	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
-	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
+
+else()
+	target_include_directories(${MODULE_NAME} PRIVATE
+		${CONAN_INCLUDE_DIRS_PORTAUDIO}
+		${CONAN_INCLUDE_DIRS_IPP}
+		${CONAN_INCLUDE_DIRS_SPEEXDSP}
+		${CONAN_INCLUDE_DIRS_APR}/apr-1
+		${CONAN_INCLUDE_DIRS_SPANDSP}
 	)
 endif(NOT WIN32)
 
-target_include_directories(${MODULE_NAME} PRIVATE
-	${CONAN_INCLUDE_DIRS_FFMPEG}
-	if(WIN32)
-	${CONAN_INCLUDE_DIRS_PORTAUDIO}
-	${CONAN_INCLUDE_DIRS_IPP}
-	${CONAN_INCLUDE_DIRS_SPEEXDSP}
-	${CONAN_INCLUDE_DIRS_APR}/apr-1
-	${CONAN_INCLUDE_DIRS_SPANDSP}
-	endif(WIN32)
-)
-
+if(MSVC)
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SPEEXDSP}
-)
-
-if(MSVC)
-target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_PORTAUDIO}
 	${CONAN_LIB_DIRS_IPP}
 	${CONAN_LIB_DIRS_APACHE-APR}
@@ -83,6 +72,10 @@ target_link_directories(${MODULE_NAME} PRIVATE
 )
 else()
 target_link_directories(${MODULE_NAME} PRIVATE
+	${CONAN_LIB_DIRS_FFMPEG}
+	${CONAN_LIB_DIRS_SPANDSP}
+	${CONAN_LIB_DIRS_SPEEXDSP}
+	${CONAN_LIB_DIRS_PULSEAUDIO}
 	${CONAN_LIB_DIRS_APR}
 	${CONAN_LIB_DIRS_SOFIA}
 	${CONAN_LIB_DIRS_ZLIB}
@@ -127,8 +120,6 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}
 )
 endif(WIN32)
 
-
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-
 deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

Module/mod_pinpad/CMakeLists.txt

@@ -16,7 +16,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${ModuleCommonHeadPath}
 	${MODULE_BASE_DIR}/mod_heartbeat
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 
 # 添加实体需要依赖的其他共享库（包括系统库）

Module/mod_sipphone/CMakeLists.txt

@@ -69,7 +69,9 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudioframework
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudioqueue
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideorender
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudions

Module/mod_snapshot/CMakeLists.txt

@@ -20,7 +20,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
     ${CONAN_INCLUDE_DIRS_OPENCV}/opencv
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libfacecapture
-	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libbizchan
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
 )

Module/mod_ups/CMakeLists.txt

@@ -15,7 +15,7 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
 	${ModuleCommonHeadPath}
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 
 # 添加实体需要依赖的其他共享库（包括系统库）

Module/mod_watchdog/CMakeLists.txt

@@ -16,7 +16,7 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
 	${ModuleCommonHeadPath}
-	${RVC_OTHER_DEPENDENIES_DIR}/libpublicFun
+	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 
 # 添加实体需要依赖的其他共享库（包括系统库）

Plugins/MediaDevDetect/CMakeLists.txt

@@ -16,7 +16,7 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 target_include_directories(${MODULE_NAME} PRIVATE 
-    ${RVC_OTHER_DEPENDENIES_DIR}/libmediadeviceinfo
+    ${OTHER_LIB_PLATFORM_BASE_DIR}/libmediadeviceinfo
     ${PLUGINS_COMM_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CONAN_INCLUDE_DIRS_PORTAUDIO}

Plugins/MediaDevDetectBasePulse/CMakeLists.txt

@@ -17,7 +17,7 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 target_include_directories(${MODULE_NAME} PRIVATE 
-    ${RVC_OTHER_DEPENDENIES_DIR}/libmediadeviceinfo
+    ${OTHER_LIB_PLATFORM_BASE_DIR}/libmediadeviceinfo
     ${PLUGINS_COMM_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CONAN_INCLUDE_DIRS_PORTAUDIO}
@@ -35,7 +35,7 @@ if(WIN32)
 else()
     target_include_directories(${MODULE_NAME} PRIVATE 
         ${CONAN_INCLUDE_DIRS_PULSEAUDIO}
-        ${RVC_OTHER_DEPENDENIES_DIR}/libaudiomgr
+        ${OTHER_LIB_PLATFORM_BASE_DIR}/libaudiomgr
         )
         target_link_directories(${MODULE_NAME} PRIVATE
     ${CONAN_LIB_DIRS_PULSEAUDIO}

Tool/GuardianBase/GuardianBase.cpp

@@ -1,6 +1,6 @@
 // GuardianBase.cpp : Defines the exported functions for the DLL application.
 //
-#include "StdAfx.h"
+#include "stdafx.h"
 #ifdef linux
 #include <netinet/in.h>    // for sockaddr_in
 #include <sys/types.h>    // for socket

Tool/guardian/guardian.cpp

@@ -1,6 +1,6 @@
 // guardian.cpp : Defines the entry point for the console application.
 //
-#include "StdAfx.h"
+#include "stdafx.h"
 #ifdef linux
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -140,16 +140,6 @@ extern "C"
 }
 #define	FUNCTION_STDCALL
 typedef unsigned short      WORD;
-typedef struct _SYSTEMTIME {
-	WORD wYear;
-	WORD wMonth;
-	WORD wDayOfWeek;
-	WORD wDay;
-	WORD wHour;
-	WORD wMinute;
-	WORD wSecond;
-	WORD wMilliseconds;
-} SYSTEMTIME;
 #else
 typedef struct
 {

addin/cmake/BuildMakeSettings.cmake

@@ -13,8 +13,6 @@ SET(ThirdPartyHeadRoot "${PROJECT_SOURCE_DIR}/ThirdParty/Include")
 # <FrameworkHeadRoot>$(MSBuildProjectDirectory)\..\..\Framework\Include</ThirdPartyHeadRoot>
 #SET(FrameworkHeadRoot "${PROJECT_SOURCE_DIR}/third_party")
 
-SET(RVC_OTHER_DEPENDENIES_DIR ${PROJECT_SOURCE_DIR}/Other)
-
 macro(rvc_set_library_output_dir _dir)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${_dir})
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${_dir})