Z991239-890 #comment cmake: mod_AssistantChannel windows cmake编译成功

Module/mod_assistantchannel/CMakeLists.txt

@@ -0,0 +1,31 @@
+#ʵÌåÃû
+define_module("AssistantChannel")
+
+file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
+
+set(MOD_VERSION_STRING "1.0.0-dev1")
+add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
+
+# ÒÀÀµopenjpeg/zlib
+conan_cmake_run(REQUIRES openjpeg/2.0.0@LR04.02_ThirdParty/testing
+    BASIC_SETUP CMAKE_TARGETS
+    BUILD missing)
+if(WIN32)
+conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/testing
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+else(WIN32)
+conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+endif(WIN32)
+
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_OPENJPEG} ${CONAN_LIB_DIRS_ZLIB})
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS})
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} libbizchan ${CONAN_PKG_LIBS_OPENJPEG} ${CONAN_PKG_LIBS_ZLIB})  
+
+target_include_directories(${MODULE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

Module/mod_assistantchannel/mod_assistantchannel.cpp

@@ -4,10 +4,10 @@
 #include "VideoDesc.h"
 #include "AssistantChannel_server_g.h"
 
-#include "bizchan.h"
+#include "..\..\Other\libbizchan\bizchan.h"
 #include "rec_common.h"
 #include "chan_protocol.h"
-#include "..\EventCode.h"
+#include "..\include\EventCode.h"
 
 #include "..\mod_counterconnector\CallType.h"
 

Other/libbizchan/CMakeLists.txt

@@ -0,0 +1,55 @@
+set(MODULE_NAME "libbizchan")
+set(MODULE_PREFIX "LIB_BIZCHAN_FUNC")
+
+set(${MODULE_PREFIX}_SRCS
+	bizchan.c
+	jpeg2k.c
+	quicklz.c
+	quicklz.h
+	jpeg2k.h
+	bizchan.h
+)
+
+add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
+
+# 依赖openjpeg/zlib
+conan_cmake_run(REQUIRES openjpeg/2.0.0@LR04.02_ThirdParty/testing
+    BASIC_SETUP CMAKE_TARGETS
+    BUILD missing)
+if(WIN32)
+conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/testing
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+else(WIN32)
+conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+endif(WIN32)
+
+# 依赖libscreencodec
+target_include_directories(${MODULE_NAME} PRIVATE
+	"${CONAN_RVCFRAMEWORK_ROOT}/include"
+	${RVC_COMMON_INCLUDE_DIR}
+    ${CONAN_INCLUDE_DIRS_OPENJPEG}
+    ${OTHER_LIB_BASE_DIR}/libscreencodec
+    )
+
+target_compile_definitions(${MODULE_NAME} PUBLIC "LIBBIZCHAN_EXPORTS")
+
+# 添加需要依赖的其他共享库（包括系统库）
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_OPENJPEG} ${CONAN_LIB_DIRS_ZLIB})
+target_link_libraries(${MODULE_NAME} libscreencodec ${CONAN_PKG_LIBS_OPENJPEG} ${CONAN_PKG_LIBS_ZLIB} CONAN_PKG::OpenSSL ws2_32)
+
+if(MSVC)
+	install(TARGETS ${MODULE_NAME} 
+    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
+    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
+    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
+    )
+else()
+install(TARGETS ${MODULE_NAME} 
+    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
+    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
+    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
+    COMPONENT libraries)
+endif(MSVC)

Other/libscreencodec/CMakeLists.txt

@@ -0,0 +1,49 @@
+set(MODULE_NAME "libscreencodec")
+set(MODULE_PREFIX "LIB_SCREENCODEC_FUNC")
+
+set(${MODULE_PREFIX}_SRCS
+	screencodec.c
+	screencodec.h
+)
+
+add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
+
+
+if(WIN32)
+conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/testing
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+else(WIN32)
+conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+endif(WIN32)
+
+
+target_include_directories(${MODULE_NAME} PRIVATE
+	"${CONAN_RVCFRAMEWORK_ROOT}/include"
+	${RVC_COMMON_INCLUDE_DIR}
+    ${CONAN_INCLUDE_DIRS_ZLIB}
+    )
+
+target_compile_definitions(${MODULE_NAME} PUBLIC "LIBSCREENCODEC_EXPORTS")
+
+
+# 添加需要依赖的其他共享库（包括系统库）
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_ZLIB})
+target_link_libraries(${MODULE_NAME} ${CONAN_PKG_LIBS_ZLIB})
+
+
+if(MSVC)
+	install(TARGETS ${MODULE_NAME} 
+    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
+    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
+    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
+    )
+else()
+install(TARGETS ${MODULE_NAME} 
+    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
+    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
+    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
+    COMPONENT libraries)
+endif(MSVC)

Other/libscreencodec/screencodec.c

@@ -5,9 +5,9 @@
 #include <WinSock.h>
 #include <assert.h>
 
-#include <memutil.h>
+//#include <memutil.h>
 #include <zlib.h>
-#include <ipp.h>
+//#include <ipp.h>
 
 #define BS_WRITE_I2(ptr, v) \
 	*(unsigned char*)ptr = v&0x00ff; \
@@ -421,7 +421,7 @@ static int encode_frame(screen_encoder_session_t *session, const unsigned char*
 
 SCREENCODEC_API(int) screen_encoder_session_create(int width, int height, screen_encoder_session_t **p_session)
 {
-	screen_encoder_session_t *session = MALLOC_T(screen_encoder_session_t);
+	screen_encoder_session_t *session = malloc(sizeof(screen_encoder_session_t));
 	if (session) {
 		session->width = width;
 		session->height = height;
@@ -660,7 +660,7 @@ static int decode_frame(screen_decoder_session_t *session, const void *enc_buf,
 
 SCREENCODEC_API(int) screen_decoder_session_create(screen_decoder_session_t **p_session)
 {
-	screen_decoder_session_t *session = MALLOC_T(screen_decoder_session_t);
+	screen_decoder_session_t *session = malloc(sizeof(screen_decoder_session_t));
 	if (session) {
 		session->width = 0;
 		session->height = 0;