Pārlūkot izejas kodu

#IQRV #comment [BugFix] 修复Debug版本编译不过问题

gifur 4 gadi atpakaļ
vecāks
revīzija
64991385d9

+ 1 - 1
Module/mod_ResourceWatcher/ChangeLog.md

@@ -1,7 +1,7 @@
 
 
 ## 1.0.0-dev1
-
+* 修改获取Linux分区空间的方式(廖桂发,2021年5月12日)
 * Windows下编译通过
 
 

+ 1 - 1
Other/libwmvrecord/CMakeLists.txt

@@ -21,7 +21,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
-	${CONAN_INCLUDE_DIRS_FREETYPE}
+	${CONAN_INCLUDE_DIRS_FREETYPE}/freetype2
 	${CONAN_INCLUDE_DIRS_SPEEXDSP}
     ${CONAN_INCLUDE_DIRS_OPENCV}
     ${CONAN_INCLUDE_DIRS_OPENCV}/opencv

+ 1 - 1
Other/libwmvrecord/CvxText.h

@@ -22,7 +22,7 @@
 * 实现了汉字输出功能。
 */
 
-#include <ft2build.h>
+#include "ft2build.h"
 #include FT_FREETYPE_H
 
 //#include"opnecv2/opencv.hpp"

+ 8 - 6
addin/cmake/DependencyConanFiles.cmake

@@ -1,3 +1,4 @@
+
 set(CONAN_ALLPLATFORM_LIB_NAMES
 	#mod_download mod_evtconverter mod_ThermalPrint
 	expat/2.1.0@LR04.02_ThirdParty/testing
@@ -7,14 +8,11 @@ set(CONAN_ALLPLATFORM_LIB_NAMES
 	zlib/1.2.11@LR04.02_ThirdParty/stable
 	#libbizchan mod_screenshot mod_snapshot
 	openjpeg/2.0.0@LR04.02_ThirdParty/testing
-	#mod_snapshot mod_mediacontroller mod_sipphone libvideoqueue
-	IPP/1.0@LR04.02_ThirdParty/testing
+
 	#mod_sipphone libwmvrecord libaudioframwork mod_mediacontroller libaudiorender
 	SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing 
 	#showdev mod_mediacontroller mod_sipphone libaudioframwork
 	spandsp/0.0.6@LR04.02_ThirdParty/testing
-	#mod_mediacontroller libaudioframwork showdev mod_sipphone
-	lib8k/1.0@LR04.02_ThirdParty/testing
 	#libaudioframwork
 	libtiff/4.0.9@LR04.02_ThirdParty/testing
 	#libwmvrecord
@@ -22,18 +20,22 @@ set(CONAN_ALLPLATFORM_LIB_NAMES
 	#include/test
 	Catch/2.13.0@LR04.02_ThirdParty/stable
 	#mod_CustMngrAuth mod_uplog
-	jsoncpp/1.9.0@LR04.02_ThirdParty/stable
+	jsoncpp/1.9.0@LR04.02_ThirdParty/stable # !!!!support build missing!!!!
 	#mod_chromium
 	cefclient/11.0@LR04.02_ThirdParty/testing   
 	#mod_chromium mod_RomoteController mod_rpc
 	boost/1.69.0@LR04.02_ThirdParty/testing
 	#liblog4vendor
-	log4cplus/1.2.1@LR04.02_ThirdParty/slim
+	log4cplus/1.2.1@LR04.02_ThirdParty/slim # !!!!support build missing!!!!
 )
 
 
 if(MSVC)
 set(CONAN_CURPLATFORM_LIB_NAMES
+		#mod_snapshot mod_mediacontroller mod_sipphone libvideoqueue
+		IPP/1.0@LR04.02_ThirdParty/testing
+		#mod_mediacontroller libaudioframwork showdev mod_sipphone
+		lib8k/1.0@LR04.02_ThirdParty/testing
 		#mod_sipphone mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture libimageproc
 		opencv/3.1.0@LR04.02_ThirdParty/testing
 		#mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture