#IQBX #comment CEFClient补充

CMakeLists.txt

@@ -449,6 +449,8 @@ set(RVC_CONFIG_PATH    "${PACK_INSTALL_PREFIX_CUR_VER}/cfg")
 set(RVC_VENDOR_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/dep")
 set(RVC_SHARED_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/share")
 set(RVC_RESOURCE_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/res")
+#win
+set(RVC_CHROMIUM_PATH "${RVC_RUNTIME_PATH}/Chromium")
 
 set(CMAKE_INSTALL_INCLUDEDIR ${RVC_INCLUDE_PATH})
 set(CMAKE_INSTALL_BINDIR ${RVC_RUNTIME_PATH})
@@ -718,6 +720,37 @@ if(CONAN_LIB_DIRS_QT)
 	list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_QT})# 1.0.5-dev5
 endif(CONAN_LIB_DIRS_QT)
 
+if(MSVC)
+	if(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
+		message(STATUS "remove cefclient dirs")
+		list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_MUTABLE})
+		file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_CEFCLIENT_MUTABLE}/Chromium/*")
+		foreach(item ${RVC_CHROMIUM_BIN_FILES})
+			if(IS_DIRECTORY ${item})
+				install(DIRECTORY "${item}" DESTINATION "${RVC_CHROMIUM_PATH}" COMPONENT libraries )
+			else()
+				install(FILES ${item} DESTINATION "${RVC_CHROMIUM_PATH}" 
+				PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+				COMPONENT libraries)
+			endif()
+		endforeach()
+	endif(CONAN_BIN_DIRS_CEFCLIENT_MUTABLE)
+	if(CONAN_BIN_DIRS_CEFCLIENT_CONST)
+		message(STATUS "remove cefclient dirs")
+		list(REMOVE_ITEM RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_CEFCLIENT_CONST})
+		file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CONAN_BIN_DIRS_CEFCLIENT_CONST}/Chromium/*")
+		foreach(item ${RVC_CHROMIUM_BIN_FILES})
+			if(IS_DIRECTORY ${item})
+				install(DIRECTORY "${item}" DESTINATION "${RVC_CHROMIUM_PATH}" COMPONENT libraries )
+			else()
+				install(FILES ${item} DESTINATION "${RVC_CHROMIUM_PATH}" 
+				PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+				COMPONENT libraries)
+			endif()
+		endforeach()
+	endif(CONAN_BIN_DIRS_CEFCLIENT_CONST)
+endif(MSVC)
+
 foreach(bin_dir ${RVC_CONAN_DEP_LIBS})
 	message(STATUS "bin dir: ${bin_dir}")
 	# file(GLOB RVC_CONAN_BIN_FILES  LIST_DIRECTORIES false "${bin_dir}/*.so" "${bin_dir}/*.dll")
@@ -749,8 +782,6 @@ install(FILES ${RVC_RESOURCE_FILES} DESTINATION ${RVC_RUNTIME_PATH} COMPONENT re
 install(DIRECTORY "${CONAN_RES_DIRS_AUDIO}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
 #install(DIRECTORY "${CONAN_RES_DIRS_VIDEO}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
 
-
-
 if(CONAN_RES_DIRS_SOGOUIME)
 	message(STATUS "include sogou input installation.")
 	install(DIRECTORY "${CONAN_RES_DIRS_SOGOUIME}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)

addin/cmake/DependencyConanFiles.cmake

@@ -59,7 +59,14 @@ if(MSVC)
 			log4cplus/1.2.1@LR04.02_ThirdParty/stable
 			#mod_chromium
 			CEFControl/1.0@LR04.02_ThirdParty/testing
+			#mod_chromium
+			cefclient_mutable/3.0@LR04.02_ThirdParty/testing
 			)
+
+			
+	if(TRUE) #todo
+		list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/1.0@LR04.02_ThirdParty/testing)
+	endif(TRUE)
 else()
 	set(CONAN_CURPLATFORM_LIB_NAMES
 			#mod_snapshot mod_screenshot mod_RomoteController mod_UpgradeRun mod_upload libscreencodec 
@@ -125,6 +132,10 @@ conan_cmake_run(REQUIRES
 	${CONAN_ALLPLATFORM_LIB_NAMES}
 BASIC_SETUP CMAKE_TARGETS)
 
+if(MSVC)
+set(AARCH64_USELESS_LIBRARY_FILE_NAMES
+)
+else()
 set(AARCH64_USELESS_LIBRARY_FILE_NAMES
 	pkgconfig/*
 	addrinfo
@@ -234,6 +245,7 @@ set(AARCH64_USELESS_LIBRARY_FILE_NAMES
 	stunc
 	yuvconvert
 )
+endif(MSVC)
 
 #/usr/bin/ld: cannot find -lasound ////mod_mediacontroller -> sudo apt-get -y install libasound2-dev
 ##include <X11/Xutil.h> ///screencapture ->sudo apt-get install libx11-dev 

addin/hardwarecfg/root.ini.win32

@@ -1,5 +1,5 @@
 [Terminal]
-TerminalNo=7555980001
+TerminalNo=7555980136
 MachineType=RVC.Stand2S
 MachineVersion=2.0
 Manufacturer=CMB