V0.11

CC_SDK/CMakeLists.txt

@@ -31,6 +31,8 @@ add_subdirectory(Environment/mirrors_nlohmann_json)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "OHOS")
     add_subdirectory(Environment/openssl)
+#elseif (WIN32)
+#    add_subdirectory(Environment/openssl)
 else ()
     add_subdirectory(Environment/openssl-cmake)
 endif ()
@@ -126,7 +128,7 @@ if (GLFW)
     add_subdirectory(Environment/glfw)
 endif ()
 
-option(ZLIB "CC_ZLIB_OAF" OFF)
+option(ZLIB "CC_ZLIB_OAF" ON)
 if (ZLIB)
     add_subdirectory(Environment/zlib)
     set(MINIZIP_SOURCES
@@ -251,6 +253,8 @@ if (ZLIB)
         Include/Environment/zlib/CCZip.cpp
         Include/Environment/zlib/CCDataFormat.cpp
         Include/Module/Window/Control/Icon.h
+            Include/Environment/zlib/CCGZip.cpp
+            Include/Environment/zlib/CCGZip.h
     )
 endif ()
 
@@ -310,7 +314,6 @@ if (APIS)
             src/Module/Comm/WebSocket/string_helper.cpp
             src/Module/Comm/WebSocket/ws_endpoint.cpp
             src/Module/Comm/WebSocket/ws_packet.cpp
-            Include/Module/Comm/WebSocket/CCWebSocket.h
             src/Module/Comm/WebSocket/CCWebSocket.cpp
             Include/CCServlet/applink.h
             src/Module/Window/CCApplication.cpp
@@ -338,6 +341,9 @@ if (APIS)
             src/Module/Comm/Socket/CCServerSocket.cpp
             src/Module/Comm/Socket/CCClientSocket.cpp
             ${CC_DataChannel}
+            src/Module/IO/EventLoop.cpp
+            src/CCServlet/HttpSocketChannel.cpp
+            src/Module/Comm/OpenSSL/CCSSL.cpp
     )
     target_include_directories(CC_API PUBLIC
             ${CC_API_INC}

CC_SDK/Environment/libdatachannel/CMakeLists.txt

@@ -397,6 +397,9 @@ else()
 	if (CMAKE_SYSTEM_NAME STREQUAL "OHOS")
 		target_include_directories(datachannel PRIVATE ${CC_OPENSSL_INC})
 		target_include_directories(datachannel-static PRIVATE ${CC_OPENSSL_INC})
+	elseif (WIN32)
+		target_include_directories(datachannel PRIVATE ${CC_OPENSSL_INC})
+		target_include_directories(datachannel-static PRIVATE ${CC_OPENSSL_INC})
 	else ()
 		target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../openssl-cmake/include)
 		target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../openssl-cmake/include)

CC_SDK/Environment/libdatachannel/deps/libsrtp/CMakeLists.txt

@@ -259,12 +259,14 @@ target_include_directories(srtp2 PUBLIC
 )
 
 if(ENABLE_OPENSSL)
-  target_include_directories(srtp2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../openssl/thirdparty/openssl/arm64-v8a/include)
-#  if (CMAKE_SYSTEM_NAME STREQUAL "OHOS")
-#    target_include_directories(srtp2 PRIVATE ${CC_OPENSSL_INC})
-#  else ()
-#
-#  endif ()
+#  target_include_directories(srtp2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../openssl/thirdparty/openssl/arm64-v8a/include)
+  if (CMAKE_SYSTEM_NAME STREQUAL "OHOS")
+    target_include_directories(srtp2 PRIVATE ${CC_OPENSSL_INC})
+  elseif (WIN32)
+	target_include_directories(srtp2 PRIVATE ${CC_OPENSSL_INC})
+  else ()
+	target_include_directories(srtp2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../openssl/thirdparty/openssl/OpenHarmony/arm64-v8a/include)
+  endif ()
   target_link_libraries(srtp2 crypto)
 elseif(ENABLE_MBEDTLS)
   target_include_directories(srtp2 PRIVATE ${MBEDTLS_INCLUDE_DIRS})

CC_SDK/Environment/openssl/CMakeLists.txt

@@ -20,37 +20,54 @@ add_library(ssl STATIC
     src/ssl.cpp
 )
 if (WIN32)
-
-elseif (CMAKE_SYSTEM_NAME STREQUAL "OHOS")
     set(CC_OPENSSL_INC
-            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/${OHOS_ARCH}/include
-            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/${OHOS_ARCH}/include/openssl
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/Win32/include
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/Win32/include/openssl
             PARENT_SCOPE
     )
     target_include_directories(crypto PUBLIC
             ${CC_OPENSSL_INC}
     )
     target_link_libraries(crypto PUBLIC
-            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/${OHOS_ARCH}/lib/libcrypto.a
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/Win32/bin/libcrypto-3-x64.dll
     )
     target_include_directories(ssl PUBLIC
             ${CC_OPENSSL_INC}
     )
     target_link_libraries(ssl PUBLIC
-            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/${OHOS_ARCH}/lib/libssl.a
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/Win32/bin/libssl-3-x64.dll
+    )
+elseif (CMAKE_SYSTEM_NAME STREQUAL "OHOS")
+    set(CC_OPENSSL_INC
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/OpenHarmony/${OHOS_ARCH}/include
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/OpenHarmony/${OHOS_ARCH}/include/openssl
+            PARENT_SCOPE
+    )
+    target_include_directories(crypto PUBLIC
+            ${CC_OPENSSL_INC}
+    )
+    target_link_libraries(crypto PUBLIC
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/OpenHarmony/${OHOS_ARCH}/lib/libcrypto.a
+    )
+    target_include_directories(ssl PUBLIC
+            ${CC_OPENSSL_INC}
+    )
+    target_link_libraries(ssl PUBLIC
+            ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/OpenHarmony/${OHOS_ARCH}/lib/libssl.a
     )
 elseif (UNIX)
 
 endif()
 
 if (CMAKE_HOST_WIN32)
-#    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-#    add_custom_command(TARGET CC_FFmpeg_API POST_BUILD
-#            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-#            $<TARGET_FILE:CC_FFmpeg_API>
-#            ${CMAKE_BINARY_DIR}/bin
-#            COMMENT "Copying CC_FFmpeg_API library to bin directory"
-#    )
+	add_custom_command(TARGET crypto POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different
+		${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/Win32/bin/libcrypto-3-x64.dll
+		${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/Win32/bin/libssl-3-x64.dll
+		${CMAKE_BINARY_DIR}/bin
+		COMMENT "Copying crypto and ssl DLLs to bin directory"
+    )
 endif ()