From 0edbdb6f9cb52cd75bad13e1c2e8f062fe0dd84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E6=88=98?= <40414978+PatriceJiang@users.noreply.github.com> Date: Sat, 26 Dec 2020 14:57:34 +0800 Subject: [PATCH] [3.0] cmake: combine ios simulator & device (#3150) --- native/CMakeLists.txt | 75 +++++++------------ .../template-link/common/CMakeLists.txt | 12 +-- 2 files changed, 31 insertions(+), 56 deletions(-) diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 0031aa54b6..eefbd19ce6 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -1446,67 +1446,42 @@ if(APPLE) target_include_directories(cocos2d PUBLIC ${CWD}/cocos/platform/ios ) - find_library(ICONV_LIBRARY iconv) - find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox) - find_library(FOUNDATION_LIBRARY Foundation) - find_library(OPENAL_LIBRARY OpenAL) - find_library(GAMECONTROLLER_LIBRARY GameController) - find_library(METAL_LIBRARY Metal) - find_library(METALLIT_LIBRARY MetalKit) - find_library(SQLITE3_LIBRARY SQLite3) - find_library(SECURITY_LIBRARY Security) - find_library(SystemConfiguration_LIBRARY SystemConfiguration) target_link_libraries(cocos2d PUBLIC - ${ICONV_LIBRARY} - ${AUDIOTOOLBOX_LIBRARY} - ${FOUNDATION_LIBRARY} - ${OPENAL_LIBRARY} - ${GAMECONTROLLER_LIBRARY} - ${METAL_LIBRARY} - ${METALLIT_LIBRARY} - ${SQLITE3_LIBRARY} - ${SECURITY_LIBRARY} - ${SystemConfiguration_LIBRARY} + "-liconv" + "-framework AudioToolbox" + "-framework Foundation" + "-framework OpenAL" + "-framework GameController" + "-framework Metal" + "-framework MetalKit" + "-lSQLite3" + "-framework Security" + "-framework SystemConfiguration" ${CC_EXTERNAL_LIBS} ) if(MACOSX) - find_library(OPENGL_LIBRARY OpenGL) - find_library(APPKIT_LIBRARY AppKit) target_link_libraries(cocos2d PUBLIC - ${OPENGL_LIBRARY} - ${APPKIT_LIBRARY} + "-framework OpenGL" + "-framework AppKit" ) target_compile_definitions(cocos2d PUBLIC CC_KEYBOARD_SUPPORT ) elseif(IOS) - find_library(QUARTZCORE_LIBRARY QuartzCore) - find_library(UIKIT_LIBRARY UIKit) - find_library(AVKIT_LIBRARY AVKit) - find_library(WebKit_LIBRARY WebKit) - find_library(CORE_MOTION_LIBRARY CoreMotion) - find_library(CFNETWORK_LIBRARY CFNetwork) - find_library(CORE_MEDIA_LIBRARY CoreMedia) - find_library(CORE_TEXT_LIBRARY CoreText) - find_library(CORE_GRAPHICS_LIBRARY CoreGraphics) - find_library(AV_FOUNDATION_LIBRARY AVFoundation) - find_library(ZLIB_LIBRARY z) - find_library(OPENGLES_LIBRARY OpenGLES) - find_library(JAVASCRIPTCORE_LIBRARY JavaScriptCore) target_link_libraries(cocos2d PUBLIC - ${QUARTZCORE_LIBRARY} - ${UIKIT_LIBRARY} - ${CFNETWORK_LIBRARY} - ${ZLIB_LIBRARY} - ${CORE_GRAPHICS_LIBRARY} - ${AV_FOUNDATION_LIBRARY} - ${CORE_TEXT_LIBRARY} - ${CORE_MOTION_LIBRARY} - ${OPENGLES_LIBRARY} - ${JAVASCRIPTCORE_LIBRARY} - ${CORE_MEDIA_LIBRARY} - ${AVKIT_LIBRARY} - ${WebKit_LIBRARY} + "-framework QuartzCore" + "-framework UIKit" + "-framework AVKit" + "-framework WebKit" + "-framework CoreMotion" + "-framework CFNetwork" + "-framework CoreMedia" + "-framework CoreText" + "-framework CoreGraphics" + "-framework AVFoundation" + "-lz" + "-framework OpenGLES" + "-framework JavaScriptCore" ) set_property(TARGET cocos2d PROPERTY XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${TARGET_IOS_VERSION}) set_property(TARGET cocos2d PROPERTY XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") diff --git a/native/templates/template-link/common/CMakeLists.txt b/native/templates/template-link/common/CMakeLists.txt index 90ad3b89f8..7fc5d7b143 100644 --- a/native/templates/template-link/common/CMakeLists.txt +++ b/native/templates/template-link/common/CMakeLists.txt @@ -31,11 +31,7 @@ endif() set(DEVELOPMENT_TEAM "" CACHE STRING "APPLE Developtment Team") set(RES_DIR "" CACHE STRING "Resource path") -if(CMAKE_OSX_SYSROOT STREQUAL "iphonesimulator") - set(TARGET_IOS_VERSION "9.0") -else() - set(TARGET_IOS_VERSION "8.0") -endif() +set(TARGET_IOS_VERSION "9.0") set(TARGET_OSX_VERSION "10.10") if(RES_DIR) @@ -230,7 +226,11 @@ if(APPLE) target_include_directories(${LIB_NAME} PRIVATE ${PROJ_SRC_DIR}/service ) - set_target_properties(${LIB_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJ_SRC_DIR}/Info.plist") + set_target_properties(${LIB_NAME} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${PROJ_SRC_DIR}/Info.plist" + IOS_INSTALL_COMBINED YES + OSX_ARCHITECTURES "arm64;x86_64" + ) set_property(TARGET ${LIB_NAME} PROPERTY XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM}") set_property(TARGET ${LIB_NAME} PROPERTY XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer") set_property(TARGET ${LIB_NAME} PROPERTY XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon")