From 12f2bf26e65b8656e3cd40eaafd3370027264ea2 Mon Sep 17 00:00:00 2001 From: patricejiang Date: Wed, 1 Apr 2020 16:56:45 +0800 Subject: [PATCH] compile ios --- mac/CMakeLists.txt | 13 ++++++++++++- sources/SocketRocket/CMakeLists.txt | 8 ++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt index d2e4a706..aa8329b8 100644 --- a/mac/CMakeLists.txt +++ b/mac/CMakeLists.txt @@ -84,6 +84,16 @@ set_target_properties(mozglue PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libmozglue.a ) +add_library(EGL SHARED IMPORTED GLOBAL) +set_target_properties(EGL PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libEGL.dylib +) + +add_library(GLESv2 SHARED IMPORTED GLOBAL) +set_target_properties(GLESv2 PROPERTIES + IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libGLESv2.dylib +) + set(se_libs_name) if(USE_SE_V8) @@ -123,7 +133,8 @@ endif() list(APPEND CC_EXTERNAL_LIBS freetype - glfw3 + EGL + GLESv2 jpeg png webp diff --git a/sources/SocketRocket/CMakeLists.txt b/sources/SocketRocket/CMakeLists.txt index 4d3a0dde..a76081e1 100644 --- a/sources/SocketRocket/CMakeLists.txt +++ b/sources/SocketRocket/CMakeLists.txt @@ -46,8 +46,12 @@ set(SOCKET_ROCKET_SOURCES ) add_library(SocketRocket ${SOCKET_ROCKET_SOURCES}) - -cocos_mark_code_files(SocketRocket) +if(IOS) + set_property(TARGET SocketRocket PROPERTY XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${TARGET_IOS_VERSION}) + set_property(TARGET SocketRocket PROPERTY XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") + set_property(TARGET SocketRocket PROPERTY XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "YES") +endif() +source_group(TREE ${CMAKE_CURRENT_LIST_DIR} PREFIX "Source Files" FILES ${SOCKET_ROCKET_SOURCES}) target_include_directories(SocketRocket PUBLIC ${CMAKE_CURRENT_LIST_DIR}