From 0d37c31cf50c1ef488527d176c010131d892b9f9 Mon Sep 17 00:00:00 2001 From: mmyduckx <308303735@qq.com> Date: Fri, 19 Aug 2022 10:20:11 +0800 Subject: [PATCH] ios websocketServer support (#281) --- ios-m1-simulator/CMakeLists.txt | 20 ++++++++++++++++++-- ios/CMakeLists.txt | 20 ++++++++++++++++++-- mac/CMakeLists.txt | 19 ++++++++++++------- 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/ios-m1-simulator/CMakeLists.txt b/ios-m1-simulator/CMakeLists.txt index 266a1fbb..caa22089 100644 --- a/ios-m1-simulator/CMakeLists.txt +++ b/ios-m1-simulator/CMakeLists.txt @@ -38,6 +38,11 @@ set_target_properties(webp PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libwebp.a ) +add_library(websockets STATIC IMPORTED GLOBAL) +set_target_properties(websockets PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libwebsockets.a +) + add_library(v8_monolith STATIC IMPORTED GLOBAL) set(V8_COMPILE_FLAGS V8_TYPED_ARRAY_MAX_SIZE_IN_HEAP=64 @@ -101,6 +106,19 @@ if(USE_SE_JSC) set(se_libs_name ${JAVASCRIPT_CORE_LIBRARY}) endif() +if(USE_SOCKET) + list(APPEND CC_EXTERNAL_LIBS + ssl + crypto + ) +endif() + +if(USE_WEBSOCKET_SERVER) + list(APPEND CC_EXTERNAL_LIBS + websockets + ) +endif() + ############################# glslang ############################# add_library(GenericCodeGen STATIC IMPORTED GLOBAL) @@ -206,8 +224,6 @@ list(APPEND CC_EXTERNAL_LIBS jpeg png webp - crypto - ssl ${glslang_libs_name} ${spirv-cross_libs_name} ${tbb_libs_name} diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt index 524583d0..759838cf 100644 --- a/ios/CMakeLists.txt +++ b/ios/CMakeLists.txt @@ -38,6 +38,11 @@ set_target_properties(webp PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libwebp.a ) +add_library(websockets STATIC IMPORTED GLOBAL) +set_target_properties(websockets PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libwebsockets.a +) + add_library(v8_monolith STATIC IMPORTED GLOBAL) set(V8_COMPILE_FLAGS V8_TYPED_ARRAY_MAX_SIZE_IN_HEAP=64 @@ -101,6 +106,19 @@ if(USE_SE_JSC) set(se_libs_name ${JAVASCRIPT_CORE_LIBRARY}) endif() +if(USE_SOCKET) + list(APPEND CC_EXTERNAL_LIBS + ssl + crypto + ) +endif() + +if(USE_WEBSOCKET_SERVER) + list(APPEND CC_EXTERNAL_LIBS + websockets + ) +endif() + ############################# glslang ############################# add_library(GenericCodeGen STATIC IMPORTED GLOBAL) @@ -202,8 +220,6 @@ list(APPEND CC_EXTERNAL_LIBS jpeg png webp - crypto - ssl ${glslang_libs_name} ${spirv-cross_libs_name} ${tbb_libs_name} diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt index d4edb285..6e7e6036 100644 --- a/mac/CMakeLists.txt +++ b/mac/CMakeLists.txt @@ -95,11 +95,18 @@ elseif(USE_SE_V8) endif() endif() -# if(USE_SOCKETS) -# list(APPEND CC_EXTERNAL_LIBS -# websockets -# ) -# endif() +if(USE_SOCKET) + list(APPEND CC_EXTERNAL_LIBS + ssl + crypto + ) +endif() + +if(USE_WEBSOCKET_SERVER) + list(APPEND CC_EXTERNAL_LIBS + websockets + ) +endif() ############################# glslang ############################# @@ -198,8 +205,6 @@ list(APPEND CC_EXTERNAL_LIBS png webp curl - crypto - ssl ${glslang_libs_name} ${spirv-cross_libs_name} ${tbb_libs_name}