diff --git a/cmake/Modules/CocosBuildHelpers.cmake b/cmake/Modules/CocosBuildHelpers.cmake index 38ece29037..01d6b4adbd 100644 --- a/cmake/Modules/CocosBuildHelpers.cmake +++ b/cmake/Modules/CocosBuildHelpers.cmake @@ -202,6 +202,10 @@ function(setup_cocos_app_config app_name) if(XCODE OR VS) cocos_mark_code_files(${app_name}) endif() + + if (XCODE) + cocos_config_app_xcode_property(${app_name}) + endif() endfunction() # if cc_variable not set, then set it cc_value @@ -211,52 +215,6 @@ macro(cocos_set_default_value cc_variable cc_value) endif() endmacro() -# generate macOS app package infomations, need improve for example, the using of info.plist -function(cocos_pak_xcode cocos_target) - set(oneValueArgs - INFO_PLIST - BUNDLE_NAME - BUNDLE_VERSION - COPYRIGHT - GUI_IDENTIFIER - ICON_FILE - INFO_STRING - LONG_VERSION_STRING - SHORT_VERSION_STRING - ) - set(multiValueArgs) - cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - string(TIMESTAMP ARGS_COPYRIGHT_YEAR "%Y") - # set default value - cocos_set_default_value(ARGS_INFO_PLIST "MacOSXBundleInfo.plist.in") - cocos_set_default_value(ARGS_BUNDLE_NAME "\${PRODUCT_NAME}") - cocos_set_default_value(ARGS_BUNDLE_VERSION "1") - cocos_set_default_value(ARGS_COPYRIGHT "Copyright © ${ARGS_COPYRIGHT_YEAR}. All rights reserved.") - cocos_set_default_value(ARGS_GUI_IDENTIFIER "org.cocos2dx.${APP_NAME}") - cocos_set_default_value(ARGS_ICON_FILE "Icon") - cocos_set_default_value(ARGS_INFO_STRING "cocos2d-x app") - cocos_set_default_value(ARGS_LONG_VERSION_STRING "1.0.0") - cocos_set_default_value(ARGS_SHORT_VERSION_STRING "1.0") - # set default values for Info.plist template - set_target_properties(${cocos_target} - PROPERTIES - MACOSX_BUNDLE_INFO_PLIST ${ARGS_INFO_PLIST} - ) - set(MACOSX_BUNDLE_BUNDLE_NAME ${ARGS_BUNDLE_NAME} PARENT_SCOPE) - set(MACOSX_BUNDLE_BUNDLE_VERSION ${ARGS_BUNDLE_VERSION} PARENT_SCOPE) - set(MACOSX_BUNDLE_COPYRIGHT ${ARGS_COPYRIGHT} PARENT_SCOPE) - set(MACOSX_BUNDLE_GUI_IDENTIFIER ${ARGS_GUI_IDENTIFIER} PARENT_SCOPE) - set(MACOSX_BUNDLE_ICON_FILE ${ARGS_ICON_FILE} PARENT_SCOPE) - set(MACOSX_BUNDLE_INFO_STRING ${ARGS_INFO_STRING} PARENT_SCOPE) - set(MACOSX_BUNDLE_LONG_VERSION_STRING ${ARGS_LONG_VERSION_STRING} PARENT_SCOPE) - set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${ARGS_SHORT_VERSION_STRING} PARENT_SCOPE) - - message(STATUS "cocos package: ${cocos_target}, plist file: ${ARGS_INFO_PLIST}") - - cocos_config_app_xcode_property(${cocos_target}) -endfunction() - # set Xcode property for application, include all depend target macro(cocos_config_app_xcode_property cocos_app) set(depend_libs) @@ -271,7 +229,6 @@ endmacro() # custom Xcode property for iOS target macro(cocos_config_target_xcode_property cocos_target) if(IOS) - set_xcode_property(${cocos_target} IPHONEOS_DEPLOYMENT_TARGET "8.0") set_xcode_property(${cocos_target} ENABLE_BITCODE "NO") set_xcode_property(${cocos_target} ONLY_ACTIVE_ARCH "YES") endif() diff --git a/cmake/Modules/CocosConfigDefine.cmake b/cmake/Modules/CocosConfigDefine.cmake index 54ae371fa8..63f2360af7 100644 --- a/cmake/Modules/CocosConfigDefine.cmake +++ b/cmake/Modules/CocosConfigDefine.cmake @@ -76,6 +76,7 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) # check visual studio version if(WINDOWS) diff --git a/cmake/Modules/iOSBundleInfo.plist.in b/cmake/Modules/iOSBundleInfo.plist.in deleted file mode 100644 index fa2a779a2d..0000000000 --- a/cmake/Modules/iOSBundleInfo.plist.in +++ /dev/null @@ -1,51 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} - CFBundleGetInfoString - ${MACOSX_BUNDLE_INFO_STRING} - CFBundleIconFile - ${MACOSX_BUNDLE_ICON_FILE} - CFBundleIdentifier - ${MACOSX_BUNDLE_GUI_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLongVersionString - ${MACOSX_BUNDLE_LONG_VERSION_STRING} - CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} - CFBundleSignature - ???? - CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} - CSResourcesFileMapped - - LSRequiresIPhoneOS - - UIStatusBarHidden - - UIRequiresFullScreen - - UILaunchStoryboardName - LaunchScreen - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeRight - UIInterfaceOrientationLandscapeLeft - - NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} - CFBundleIconFiles - - ${MACOSX_BUNDLE_ICON_FILE} - - - diff --git a/cmake/README.md b/cmake/README.md index ce9e6b785b..cfa80ffaf8 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -60,9 +60,52 @@ cmake .. -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos open Cocos2d-x.xcodeproj ``` -The parameter `-DCMAKE_OSX_SYSROOT=iphoneos` is optional, it generates a build for running on the iOS device. If you want to run in the simulator, please add `-DCMAKE_OSX_SYSROOT=iphonesimulator`, but remember you can't run a metal-support app in the simulator until Xcode 11 and MacOS 10.15. +#### How do I customize the generated Xcode project? + +Xcode project settings that you want to affect both the app project and the Cocos2d-X library project should be passed on the command +line when invoking `cmake`. + +Xcode project settings that you want to affect the app project only shoudl be put into the its `CMakeLists.txt` file. + +Any Xcode Build Setting can be changed by setting `CMAKE_XCODE_ATTRIBUTE_XXX` where `XXX` is the name found within the Xcode Build +Settings page of the target. The following image shows the name of the iOS Deployment Target: + +![Find Xcode Build Setting](images/Xcode_Find_Setting_Name.png) + +Cocos also provides the function `set_xcode_property()` to make this easier to set from within a `CMakeLists.txt` file, where only +the `XXX` part needed to be specified: + +``` +set_xcode_property(${APP_NAME} XXX "Value") +``` + +##### Deployment Target + +As explained above, pass this on the command line so both the app the Cocos2d-x are built using the same version: + +For iOS pass `-DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET=version`, where `version` is `9.0`, `10.0`, etc. + +For macOS pass `-DCMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET=version`, where `version` is `10.12`, `10.13`, etc. + +##### Code Signing Development Team + +This should be set in the app `CMakeLists.txt` file. You only need to set the "Development Team" as Xcode will automatically manage the +other settings (certificate type, etc.). However the value you set is the 10-digit serial number following the development team name, +which you can see in the top-right of the [Apple Developer Certificates](https://developer.apple.com/account/resources/certificates/list) page. + +Set it like this: +``` +set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9") +``` + +##### Bundle Identifier, Version numbers and Device Support + +All this information is held in the `Info.plist` file that is part of the app's source files and is therefore not generated by `cmake`. Therefore +you can update these values from the `General` page of the Xcode target and the values will be preserved the next time you regenerate the project +from `cmake`: + +![Xcode General Page](images/Xcode_General_Page.png) -if you want to sign iOS app in CMake, you will need to fill development team ID into `set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "")`, or select to sign in Xcode after project files generated. ### Android Studio diff --git a/cmake/images/Xcode_Find_Setting_Name.png b/cmake/images/Xcode_Find_Setting_Name.png new file mode 100644 index 0000000000..2ce8a61818 Binary files /dev/null and b/cmake/images/Xcode_Find_Setting_Name.png differ diff --git a/cmake/images/Xcode_General_Page.png b/cmake/images/Xcode_General_Page.png new file mode 100644 index 0000000000..fc1eea565b Binary files /dev/null and b/cmake/images/Xcode_General_Page.png differ diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt index c2f0edd638..50349bfbd0 100644 --- a/cocos/CMakeLists.txt +++ b/cocos/CMakeLists.txt @@ -152,3 +152,9 @@ if(WINDOWS) # compile c as c++. needed for precompiled header set_source_files_properties(${COCOS_SPINE_SRC} base/ccFPSImages.c PROPERTIES LANGUAGE CXX) endif() + +#if(XCODE) +# # Later versions of Xcode clang want to compile C++17 with aligned allocation turned on and this is only supported on iOS 11.0+ +# # TODO: Only turn this off if ${CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET} < 11.0 +# target_compile_options(cocos2d PUBLIC $<$:-fno-aligned-allocation>) +#endif() diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 008e06e4c8..210c9e56f4 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -27,8 +27,9 @@ "cmake/Modules/Findflatbuffers.cmake", "cmake/Modules/Findxxhash.cmake", "cmake/Modules/PreventInSourceBuilds.cmake", - "cmake/Modules/iOSBundleInfo.plist.in", "cmake/README.md", + "cmake/images/Xcode_Find_Setting_Name.png", + "cmake/images/Xcode_General_Page.png", "cocos/2d/CCAction.cpp", "cocos/2d/CCAction.h", "cocos/2d/CCActionCamera.cpp", diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index 25416f543f..a694ef80fe 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -133,16 +133,16 @@ target_include_directories(${APP_NAME} setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") + if(MACOSX) - set_target_properties(${APP_NAME} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist" - ) + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") elseif(IOS) - cocos_pak_xcode(${APP_NAME} INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon") - set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "") - set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") endif() + + # For code-signing, set the DEVELOPMENT_TEAM: + #set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9") elseif(WINDOWS) cocos_copy_target_dll(${APP_NAME}) endif() diff --git a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist index 8b4aea8f9b..739c1700a8 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist +++ b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist @@ -7,25 +7,23 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} + ${EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIdentifier - org.cocos2dx.hellocpp + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} - CFBundleLongVersionString - ${MACOSX_BUNDLE_LONG_VERSION_STRING} + ${PRODUCT_NAME} CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + 1.0 CFBundlePackageType APPL CFBundleSignature ???? CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} + 1 LSRequiresIPhoneOS UIAppFonts @@ -42,6 +40,6 @@ UIInterfaceOrientationLandscapeLeft NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} + Copyright © 2019. All rights reserved. diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist index 503a22c369..01667c8d0a 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist @@ -7,21 +7,19 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} + ${EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIdentifier - org.cocos2dx.hellolua + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} + 1 CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} - CFBundleLongVersionString - ${MACOSX_BUNDLE_LONG_VERSION_STRING} + ${PRODUCT_NAME} CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + 1.0 CFBundlePackageType APPL CFBundleSignature @@ -47,6 +45,6 @@ UIInterfaceOrientationLandscapeLeft NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} + Copyright © 2019. All rights reserved. diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist index f72b36417b..7251aefce9 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - org.cocos2dx.hellolua + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -24,10 +24,8 @@ 1 LSApplicationCategoryType public.app-category.games - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - Copyright © 2013. All rights reserved. + Copyright © 2019. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/tests/cpp-empty-test/CMakeLists.txt b/tests/cpp-empty-test/CMakeLists.txt index 92a5027e58..ca691c764e 100644 --- a/tests/cpp-empty-test/CMakeLists.txt +++ b/tests/cpp-empty-test/CMakeLists.txt @@ -123,21 +123,19 @@ target_link_libraries(${APP_NAME} cocos2d) target_include_directories(${APP_NAME} PRIVATE Classes) -# mark app resources setup_cocos_app_config(${APP_NAME}) -if(APPLE) +if(XCODE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") + if(MACOSX) - set_target_properties(${APP_NAME} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist" - ) + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist") elseif(IOS) - cocos_pak_xcode(${APP_NAME} INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}") - set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") - set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "") - set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") endif() + + # For code-signing, set the DEVELOPMENT_TEAM: + #set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9") elseif(WINDOWS) cocos_copy_target_dll(${APP_NAME}) endif() diff --git a/tests/cpp-empty-test/proj.ios/Info.plist b/tests/cpp-empty-test/proj.ios/Info.plist index 935eac086d..c50ab342a5 100644 --- a/tests/cpp-empty-test/proj.ios/Info.plist +++ b/tests/cpp-empty-test/proj.ios/Info.plist @@ -7,7 +7,7 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} + ${EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIconFiles @@ -24,19 +24,19 @@ CFBundleIcons~ipad CFBundleIdentifier - ${MACOSX_BUNDLE_GUI_IDENTIFIER} + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} + ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + 1.0 CFBundleSignature ???? CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} + 1 LSRequiresIPhoneOS UILaunchStoryboardName @@ -50,6 +50,6 @@ UIInterfaceOrientationLandscapeRight NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} + Copyright © 2019. All rights reserved. diff --git a/tests/cpp-empty-test/proj.mac/Info.plist b/tests/cpp-empty-test/proj.mac/Info.plist index 608a82cdac..a1c1b9c2dc 100644 --- a/tests/cpp-empty-test/proj.mac/Info.plist +++ b/tests/cpp-empty-test/proj.mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -22,10 +22,8 @@ ???? CFBundleVersion 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - Copyright © 2012. All rights reserved. + Copyright © 2019. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index 052c886b7c..8bb21f9aa6 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -459,17 +459,16 @@ target_include_directories(${APP_NAME} setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") + if(MACOSX) - set_target_properties(${APP_NAME} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist" - ) + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist") elseif(IOS) - # set custom fonts - cocos_pak_xcode(${APP_NAME} INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}") - set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "") - set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") endif() + + # For code-signing, set the DEVELOPMENT_TEAM: + #set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9") elseif(WINDOWS) # "too large PDB" error often occurs in cpp-tests when using default "/Zi" target_compile_options(${APP_NAME} PRIVATE /Z7) diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist index de23973588..b340e7d833 100644 --- a/tests/cpp-tests/proj.ios/Info.plist +++ b/tests/cpp-tests/proj.ios/Info.plist @@ -7,31 +7,25 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} + ${EXECUTABLE_NAME} CFBundleIconFile - ${MACOSX_BUNDLE_ICON_FILE} + Icon CFBundleIdentifier - ${MACOSX_BUNDLE_GUI_IDENTIFIER} + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} + ${PRODUCT_NAME} CFBundlePackageType APPL - CFBundleLongVersionString - ${MACOSX_BUNDLE_LONG_VERSION_STRING} CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + 1.0 CFBundleSignature ???? CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} + 1 NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} - CFBundleIconFiles - - ${MACOSX_BUNDLE_ICON_FILE} - + Copyright © 2019. All rights reserved. LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/tests/cpp-tests/proj.mac/Info.plist b/tests/cpp-tests/proj.mac/Info.plist index 52ff14e9cf..ea5cd6d7d0 100644 --- a/tests/cpp-tests/proj.mac/Info.plist +++ b/tests/cpp-tests/proj.mac/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile Icon CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -24,15 +24,13 @@ ???? CFBundleVersion 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} NSAppTransportSecurity NSAllowsArbitraryLoads NSHumanReadableCopyright - Copyright © 2012. All rights reserved. + Copyright © 2019. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index 7b5c3c94f0..4aaa2d4eac 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -99,16 +99,16 @@ target_include_directories(${APP_NAME} PRIVATE Classes) setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") + if(MACOSX) - set_target_properties(${APP_NAME} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist" - ) + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist") elseif(IOS) - cocos_pak_xcode(${APP_NAME} INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}") - set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "") - set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") endif() + + # For code-signing, set the DEVELOPMENT_TEAM: + #set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9") elseif(WINDOWS) cocos_copy_target_dll(${APP_NAME}) endif() diff --git a/tests/lua-empty-test/project/proj.ios/Info.plist b/tests/lua-empty-test/project/proj.ios/Info.plist index 8efc91675c..1798164bd9 100644 --- a/tests/lua-empty-test/project/proj.ios/Info.plist +++ b/tests/lua-empty-test/project/proj.ios/Info.plist @@ -7,7 +7,7 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} + ${EXECUTABLE_NAME} CFBundleIconFile Icon-57.png CFBundleIcons @@ -15,23 +15,21 @@ CFBundleIcons~ipad CFBundleIdentifier - ${MACOSX_BUNDLE_GUI_IDENTIFIER} + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} + ${PRODUCT_NAME} CFBundlePackageType APPL - CFBundleLongVersionString - ${MACOSX_BUNDLE_LONG_VERSION_STRING} CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + 1.0 CFBundleSignature ???? CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} + 1 NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} + Copyright © 2019. All rights reserved. LSRequiresIPhoneOS UILaunchStoryboardName @@ -42,8 +40,6 @@ accelerometer - opengles-1 - UIStatusBarHidden diff --git a/tests/lua-empty-test/project/proj.mac/Info.plist b/tests/lua-empty-test/project/proj.mac/Info.plist index 608a82cdac..7734386383 100644 --- a/tests/lua-empty-test/project/proj.mac/Info.plist +++ b/tests/lua-empty-test/project/proj.mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -25,7 +25,7 @@ LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - Copyright © 2012. All rights reserved. + Copyright © 2019. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index 8ec34ac8a4..5becda024a 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -112,16 +112,16 @@ target_include_directories(${APP_NAME} PRIVATE Classes) setup_cocos_app_config(${APP_NAME}) if(APPLE) set_target_properties(${APP_NAME} PROPERTIES RESOURCE "${APP_UI_RES}") + if(MACOSX) - set_target_properties(${APP_NAME} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist" - ) + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist") elseif(IOS) - cocos_pak_xcode(${APP_NAME} INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") + set_xcode_property(${APP_NAME} INFOPLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/ios/Info.plist") set_xcode_property(${APP_NAME} ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon-${APP_NAME}") - set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "") - set_xcode_property(${APP_NAME} CODE_SIGN_IDENTITY "iPhone Developer") endif() + + # For code-signing, set the DEVELOPMENT_TEAM: + #set_xcode_property(${APP_NAME} DEVELOPMENT_TEAM "GRLXXXX2K9") elseif(WINDOWS) cocos_copy_target_dll(${APP_NAME}) endif() diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist index 64b0d48ad1..8539e9cd36 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist @@ -7,9 +7,9 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} + ${EXECUTABLE_NAME} CFBundleIconFile - ${MACOSX_BUNDLE_ICON_FILE} + Icon CFBundleIconFiles Icon-57.png @@ -22,17 +22,19 @@ CFBundleIcons~ipad CFBundleIdentifier - ${MACOSX_BUNDLE_GUI_IDENTIFIER} + org.cocos2dx.$(PRODUCT_NAME) CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} + $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleSignature ???? + CFBundleShortVersionString + 1.0 CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} + 1 LSRequiresIPhoneOS NSAppTransportSecurity @@ -57,8 +59,6 @@ accelerometer - opengles-1 - UIStatusBarHidden @@ -68,6 +68,6 @@ UIInterfaceOrientationLandscapeLeft NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} + Copyright © 2019. All rights reserved. diff --git a/tests/lua-tests/project/proj.ios_mac/mac/Info.plist b/tests/lua-tests/project/proj.ios_mac/mac/Info.plist index 241c3b92f6..13d0fefb77 100644 --- a/tests/lua-tests/project/proj.ios_mac/mac/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/mac/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile Icon CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -24,10 +24,8 @@ ???? CFBundleVersion 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - Copyright © 2012. All rights reserved. + Copyright © 2019. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass diff --git a/tests/performance-tests/proj.ios/Info.plist b/tests/performance-tests/proj.ios/Info.plist index e28dd7c2c2..5d9101cf04 100644 --- a/tests/performance-tests/proj.ios/Info.plist +++ b/tests/performance-tests/proj.ios/Info.plist @@ -42,7 +42,7 @@ Icon-144.png CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -50,11 +50,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - + 1.0 CFBundleSignature ???? CFBundleVersion - 1.0 + 1 LSRequiresIPhoneOS UIAppFonts @@ -151,5 +151,7 @@ UIInterfaceOrientationLandscapeRight UIInterfaceOrientationLandscapeLeft + NSHumanReadableCopyright + Copyright © 2019. All rights reserved. diff --git a/tests/performance-tests/proj.mac/Info.plist b/tests/performance-tests/proj.mac/Info.plist index c08a435c3c..7251aefce9 100644 --- a/tests/performance-tests/proj.mac/Info.plist +++ b/tests/performance-tests/proj.mac/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile Icon CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + org.cocos2dx.${PRODUCT_NAME} CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -24,10 +24,8 @@ 1 LSApplicationCategoryType public.app-category.games - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - Copyright © 2013. All rights reserved. + Copyright © 2019. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass