Browse Source

#IQRV #comment guardian更换日志编译成功

80374374 1 year ago
parent
commit
3b906ee4ef
3 changed files with 147 additions and 226 deletions
  1. 3 3
      Other/liblog4rvcother/targetver.h
  2. 5 2
      Tool/guardian/CMakeLists.txt
  3. 139 221
      Tool/guardian/guardian.cpp

+ 3 - 3
Other/liblog4rvcother/targetver.h

@@ -1,8 +1,8 @@
 #pragma once
 
-// 包括 SDKDDKVer.h 将定义可用的最高版本的 Windows 平台。
+// 鍖呮嫭 SDKDDKVer.h 灏嗗畾涔夊彲鐢ㄧ殑鏈€楂樼増鏈�殑 Windows 骞冲彴銆�
 
-// 如果要为以前的 Windows 平台生成应用程序,请包括 WinSDKVer.h,并将
-// WIN32_WINNT 宏设置为要支持的平台,然后再包括 SDKDDKVer.h。
+// 濡傛灉瑕佷负浠ュ墠鐨� Windows 骞冲彴鐢熸垚搴旂敤绋嬪簭锛岃�鍖呮嫭 WinSDKVer.h锛屽苟灏�
+// WIN32_WINNT 瀹忚�缃�负瑕佹敮鎸佺殑骞冲彴锛岀劧鍚庡啀鍖呮嫭 SDKDDKVer.h銆�
 
 #include <SDKDDKVer.h>

+ 5 - 2
Tool/guardian/CMakeLists.txt

@@ -1,7 +1,9 @@
 set(MODULE_NAME "guardian")
 
 set(CMAKE_CXX_STANDARD 11)
+if(NOT MSVC)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif(NOT MSVC)
 
 add_executable(guardian guardian.cpp)
 
@@ -9,6 +11,7 @@ target_include_directories(guardian PRIVATE
     ${RVC_TOOLKIT_INCLUDE_DIR}
     ${RVC_WINPR_INCLUDE_DIR}
     ${Tool_BASE_DIR}/GuardianBase
+    ${OTHER_LIB_BASE_DIR}/liblog4rvcother
 )
 
 target_link_directories(guardian PRIVATE
@@ -16,9 +19,9 @@ target_link_directories(guardian PRIVATE
 )
 
 if(MSVC)
-    target_link_libraries(guardian ${WINPR_LIB} ${TOOLKIT_LIB} Ws2_32)
+    target_link_libraries(guardian ${WINPR_LIB} ${TOOLKIT_LIB} Ws2_32 log4rvcother)
 else()
-    target_link_libraries(guardian ${WINPR_LIB} ${TOOLKIT_LIB})
+    target_link_libraries(guardian ${WINPR_LIB} ${TOOLKIT_LIB} log4rvcother)
 endif(MSVC)
 
 install(TARGETS ${MODULE_NAME} 

File diff suppressed because it is too large
+ 139 - 221
Tool/guardian/guardian.cpp


Some files were not shown because too many files changed in this diff