diff --git a/.travis.yml b/.travis.yml
index ed6756779f..d168d0c530 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,12 @@ matrix:
env: BUILD_TARGET=android_lua_cmake
language: android
sudo: required
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - g++-6
# android_js cmake
# - os: linux
# env: BUILD_TARGET=android_js_cmake
diff --git a/cmake/Modules/CocosBuildHelpers.cmake b/cmake/Modules/CocosBuildHelpers.cmake
index 0175f599b1..9038e887d2 100644
--- a/cmake/Modules/CocosBuildHelpers.cmake
+++ b/cmake/Modules/CocosBuildHelpers.cmake
@@ -197,14 +197,14 @@ function(setup_cocos_app_config app_name)
endfunction()
# if cc_variable not set, then set it cc_value
-macro(cocos_fake_set cc_variable cc_value)
+macro(cocos_set_default_value cc_variable cc_value)
if(NOT DEFINED ${cc_variable})
set(${cc_variable} ${cc_value})
endif()
endmacro()
# generate macOS app package infomations, need improve for example, the using of info.plist
-macro(cocos_pak_xcode cocos_target)
+function(cocos_pak_xcode cocos_target)
set(oneValueArgs
INFO_PLIST
BUNDLE_NAME
@@ -215,40 +215,39 @@ macro(cocos_pak_xcode cocos_target)
INFO_STRING
LONG_VERSION_STRING
SHORT_VERSION_STRING
- CUSTOM_FONT
)
set(multiValueArgs)
- cmake_parse_arguments(COCOS_APP "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ string(TIMESTAMP ARGS_COPYRIGHT_YEAR "%Y")
# set default value
- cocos_fake_set(COCOS_APP_INFO_PLIST "MacOSXBundleInfo.plist.in")
- cocos_fake_set(COCOS_APP_BUNDLE_NAME "\${PRODUCT_NAME}")
- cocos_fake_set(COCOS_APP_BUNDLE_VERSION "1")
- cocos_fake_set(COCOS_APP_COPYRIGHT "Copyright © 2018. All rights reserved.")
- cocos_fake_set(COCOS_APP_GUI_IDENTIFIER "org.cocos2dx.${APP_NAME}")
- cocos_fake_set(COCOS_APP_ICON_FILE "Icon")
- cocos_fake_set(COCOS_APP_INFO_STRING "cocos2d-x app")
- cocos_fake_set(COCOS_APP_LONG_VERSION_STRING "1.0.0")
- cocos_fake_set(COCOS_APP_SHORT_VERSION_STRING "1.0")
- cocos_fake_set(COCOS_APP_CUSTOM_FONT "")
- # set bundle info
+ 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 ${COCOS_APP_INFO_PLIST}
+ MACOSX_BUNDLE_INFO_PLIST ${ARGS_INFO_PLIST}
)
- set(MACOSX_BUNDLE_BUNDLE_NAME ${COCOS_APP_BUNDLE_NAME})
- set(MACOSX_BUNDLE_BUNDLE_VERSION ${COCOS_APP_BUNDLE_VERSION})
- set(MACOSX_BUNDLE_COPYRIGHT ${COCOS_APP_COPYRIGHT})
- set(MACOSX_BUNDLE_GUI_IDENTIFIER ${COCOS_APP_GUI_IDENTIFIER})
- set(MACOSX_BUNDLE_ICON_FILE ${COCOS_APP_ICON_FILE})
- set(MACOSX_BUNDLE_INFO_STRING ${COCOS_APP_INFO_STRING})
- set(MACOSX_BUNDLE_LONG_VERSION_STRING ${COCOS_APP_LONG_VERSION_STRING})
- set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${COCOS_APP_SHORT_VERSION_STRING})
- set(MACOSX_CUSTOM_FONT_FILE ${COCOS_APP_CUSTOM_FONT})
+ 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: ${COCOS_APP_INFO_PLIST}")
+ message(STATUS "cocos package: ${cocos_target}, plist file: ${ARGS_INFO_PLIST}")
cocos_config_app_xcode_property(${cocos_target})
-endmacro()
+endfunction()
# set Xcode property for application, include all depend target
macro(cocos_config_app_xcode_property cocos_app)
diff --git a/cmake/Modules/iOSBundleInfo.plist.in b/cmake/Modules/iOSBundleInfo.plist.in
index 76c9781d71..fa2a779a2d 100644
--- a/cmake/Modules/iOSBundleInfo.plist.in
+++ b/cmake/Modules/iOSBundleInfo.plist.in
@@ -47,9 +47,5 @@
${MACOSX_BUNDLE_ICON_FILE}
- UIAppFonts
-
- ${MACOSX_CUSTOM_FONT_FILE}
-
diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json
index d69e34dfeb..d4a12007f3 100644
--- a/templates/cocos2dx_files.json
+++ b/templates/cocos2dx_files.json
@@ -219,7 +219,6 @@
"cocos/CMakeLists.txt",
"cocos/audio/AudioEngine.cpp",
"cocos/audio/CMakeLists.txt",
- "cocos/audio/SimpleAudioEngine.cpp",
"cocos/audio/android/AssetFd.cpp",
"cocos/audio/android/AssetFd.h",
"cocos/audio/android/AudioBufferProvider.h",
@@ -298,7 +297,6 @@
"cocos/audio/apple/AudioPlayer.mm",
"cocos/audio/include/AudioEngine.h",
"cocos/audio/include/Export.h",
- "cocos/audio/include/SimpleAudioEngine.h",
"cocos/audio/linux/AudioEngine-linux.cpp",
"cocos/audio/linux/AudioEngine-linux.h",
"cocos/audio/win32/AudioCache.cpp",
@@ -539,6 +537,8 @@
"cocos/editor-support/cocostudio/FlatBuffersSerialize.h",
"cocos/editor-support/cocostudio/LocalizationManager.cpp",
"cocos/editor-support/cocostudio/LocalizationManager.h",
+ "cocos/editor-support/cocostudio/SimpleAudioEngine.cpp",
+ "cocos/editor-support/cocostudio/SimpleAudioEngine.h",
"cocos/editor-support/cocostudio/TriggerBase.cpp",
"cocos/editor-support/cocostudio/TriggerBase.h",
"cocos/editor-support/cocostudio/TriggerMng.cpp",
@@ -1050,8 +1050,6 @@
"cocos/renderer/backend/ShaderCache.h",
"cocos/renderer/backend/ShaderModule.cpp",
"cocos/renderer/backend/ShaderModule.h",
- "cocos/renderer/backend/StringUtils.cpp",
- "cocos/renderer/backend/StringUtils.h",
"cocos/renderer/backend/Texture.cpp",
"cocos/renderer/backend/Texture.h",
"cocos/renderer/backend/Types.cpp",
@@ -1165,10 +1163,6 @@
"cocos/scripting/deprecated/CCString.cpp",
"cocos/scripting/deprecated/CCString.h",
"cocos/scripting/deprecated/CMakeLists.txt",
- "cocos/storage/CMakeLists.txt",
- "cocos/storage/local-storage/LocalStorage-android.cpp",
- "cocos/storage/local-storage/LocalStorage.cpp",
- "cocos/storage/local-storage/LocalStorage.h",
"cocos/ui/CMakeLists.txt",
"cocos/ui/CocosGUI.cpp",
"cocos/ui/CocosGUI.h",
@@ -2259,6 +2253,9 @@
"external/edtaa3func/edtaa3func.cpp",
"external/edtaa3func/edtaa3func.h",
"external/empty.cpp",
+ "external/fbx-conv/README.md",
+ "external/fbx-conv/mac/fbx-conv",
+ "external/fbx-conv/mac/libfbxsdk.dylib",
"external/flatbuffers/Android.mk",
"external/flatbuffers/CMakeLists.txt",
"external/flatbuffers/flatbuffers.h",
@@ -2778,9 +2775,7 @@
"external/linux-specific/fmod/include/fmod_errors.h",
"external/linux-specific/fmod/include/fmod_output.h",
"external/linux-specific/fmod/prebuilt/64-bit/libfmod.so",
- "external/linux-specific/fmod/prebuilt/64-bit/libfmod.so.6",
"external/linux-specific/fmod/prebuilt/64-bit/libfmodL.so",
- "external/linux-specific/fmod/prebuilt/64-bit/libfmodL.so.6",
"external/md5/CMakeLists.txt",
"external/md5/md5.c",
"external/md5/md5.h",
@@ -3520,17 +3515,6 @@
"external/recast/proj.win10/librecast.vcxproj.filters",
"external/recast/proj.win32/librecast.vcxproj",
"external/recast/proj.win32/librecast.vcxproj.filters",
- "external/sqlite3/CMakeLists.txt",
- "external/sqlite3/include/sqlite3.h",
- "external/sqlite3/include/sqlite3ext.h",
- "external/sqlite3/libraries/win10/arm/sqlite3.dll",
- "external/sqlite3/libraries/win10/arm/sqlite3.lib",
- "external/sqlite3/libraries/win10/win32/sqlite3.dll",
- "external/sqlite3/libraries/win10/win32/sqlite3.lib",
- "external/sqlite3/libraries/win10/x64/sqlite3.dll",
- "external/sqlite3/libraries/win10/x64/sqlite3.lib",
- "external/sqlite3/libraries/win32/sqlite3.dll",
- "external/sqlite3/libraries/win32/sqlite3.lib",
"external/tiff/CMakeLists.txt",
"external/tiff/include/android/tiff.h",
"external/tiff/include/android/tiffconf.h",
@@ -3822,13 +3806,11 @@
"licenses/LICENSE_Kazmath.txt",
"licenses/LICENSE_LuaSocket.txt",
"licenses/LICENSE_Poly2Tri.txt",
- "licenses/LICENSE_SpiderMonkey.txt",
"licenses/LICENSE_artwork.txt",
"licenses/LICENSE_box2d.txt",
"licenses/LICENSE_chipmunk.txt",
"licenses/LICENSE_cocos2d-iphone.txt",
"licenses/LICENSE_cocos2d-x.txt",
- "licenses/LICENSE_cocosdenshion.txt",
"licenses/LICENSE_com.android.vending.expansion.zipfile.txt",
"licenses/LICENSE_curl.txt",
"licenses/LICENSE_js.txt",
@@ -3854,716 +3836,12 @@
"tools/appveyor-scripts/setup_android.py",
"tools/coding-style/include-linter.py",
"tools/coding-style/tailing-spaces.py",
- "tools/fbx-conv/README.md",
- "tools/fbx-conv/mac/fbx-conv",
- "tools/fbx-conv/mac/libfbxsdk.dylib",
"tools/missing-tools.txt",
"tools/particle/convert_YCoordFlipped.py",
"tools/performance-analyze/README.md",
"tools/performance-analyze/convertor.py",
"tools/release/generate_docs.sh"
],
- "js": [
- "cocos/scripting/js-bindings/CMakeLists.txt",
- "cocos/scripting/js-bindings/README.md",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_3d_extension_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_audioengine_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_builder_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_experimental_video_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_experimental_webView_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_extension_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_navmesh_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_network_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_physics3d_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_spine_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_studio_auto_api.js",
- "cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js",
- "cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.cpp",
- "cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes.h",
- "cocos/scripting/js-bindings/auto/js_bindings_chipmunk_auto_classes_registration.h",
- "cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.cpp",
- "cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions.h",
- "cocos/scripting/js-bindings/auto/js_bindings_chipmunk_functions_registration.h",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp",
- "cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp",
- "cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp",
- "cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h",
- "cocos/scripting/js-bindings/manual/ScriptingCore.cpp",
- "cocos/scripting/js-bindings/manual/ScriptingCore.h",
- "cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp",
- "cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.h",
- "cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.cpp",
- "cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.h",
- "cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp",
- "cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp",
- "cocos/scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp",
- "cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.cpp",
- "cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h",
- "cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp",
- "cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.h",
- "cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.cpp",
- "cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.h",
- "cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp",
- "cocos/scripting/js-bindings/manual/component/CCComponentJS.h",
- "cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp",
- "cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.h",
- "cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp",
- "cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h",
- "cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp",
- "cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h",
- "cocos/scripting/js-bindings/manual/js-BindingsExport.h",
- "cocos/scripting/js-bindings/manual/js_bindings_config.h",
- "cocos/scripting/js-bindings/manual/js_bindings_core.cpp",
- "cocos/scripting/js-bindings/manual/js_bindings_core.h",
- "cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp",
- "cocos/scripting/js-bindings/manual/js_bindings_opengl.h",
- "cocos/scripting/js-bindings/manual/js_manual_conversions.cpp",
- "cocos/scripting/js-bindings/manual/js_manual_conversions.h",
- "cocos/scripting/js-bindings/manual/js_module_register.cpp",
- "cocos/scripting/js-bindings/manual/js_module_register.h",
- "cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp",
- "cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h",
- "cocos/scripting/js-bindings/manual/jsb_helper.h",
- "cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp",
- "cocos/scripting/js-bindings/manual/jsb_opengl_functions.h",
- "cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp",
- "cocos/scripting/js-bindings/manual/jsb_opengl_manual.h",
- "cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp",
- "cocos/scripting/js-bindings/manual/jsb_opengl_registration.h",
- "cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp",
- "cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h",
- "cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions_registration.h",
- "cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp",
- "cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.h",
- "cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.cpp",
- "cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_conversions.h",
- "cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.cpp",
- "cocos/scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.h",
- "cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp",
- "cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.h",
- "cocos/scripting/js-bindings/manual/network/js_network_manual.cpp",
- "cocos/scripting/js-bindings/manual/network/js_network_manual.h",
- "cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp",
- "cocos/scripting/js-bindings/manual/network/jsb_socketio.h",
- "cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp",
- "cocos/scripting/js-bindings/manual/network/jsb_websocket.h",
- "cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp",
- "cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h",
- "cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp",
- "cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h",
- "cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h",
- "cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm",
- "cocos/scripting/js-bindings/manual/spidermonkey_specifics.h",
- "cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp",
- "cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h",
- "cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp",
- "cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h",
- "cocos/scripting/js-bindings/precheader.cpp",
- "cocos/scripting/js-bindings/precheader.h",
- "cocos/scripting/js-bindings/proj.android/Android.mk",
- "cocos/scripting/js-bindings/proj.android/CMakeLists.txt",
- "cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj",
- "external/spidermonkey/CMakeLists.txt",
- "external/spidermonkey/README.md",
- "external/spidermonkey/include/android/js-config-32.h",
- "external/spidermonkey/include/android/js-config-64.h",
- "external/spidermonkey/include/android/js-config.h",
- "external/spidermonkey/include/android/js.msg",
- "external/spidermonkey/include/android/js/Anchor.h",
- "external/spidermonkey/include/android/js/CallArgs.h",
- "external/spidermonkey/include/android/js/CallNonGenericMethod.h",
- "external/spidermonkey/include/android/js/CharacterEncoding.h",
- "external/spidermonkey/include/android/js/Class.h",
- "external/spidermonkey/include/android/js/Date.h",
- "external/spidermonkey/include/android/js/GCAPI.h",
- "external/spidermonkey/include/android/js/HashTable.h",
- "external/spidermonkey/include/android/js/HeapAPI.h",
- "external/spidermonkey/include/android/js/Id.h",
- "external/spidermonkey/include/android/js/LegacyIntTypes.h",
- "external/spidermonkey/include/android/js/MemoryMetrics.h",
- "external/spidermonkey/include/android/js/OldDebugAPI.h",
- "external/spidermonkey/include/android/js/Principals.h",
- "external/spidermonkey/include/android/js/ProfilingStack.h",
- "external/spidermonkey/include/android/js/PropertyKey.h",
- "external/spidermonkey/include/android/js/RequiredDefines.h",
- "external/spidermonkey/include/android/js/RootingAPI.h",
- "external/spidermonkey/include/android/js/SliceBudget.h",
- "external/spidermonkey/include/android/js/StructuredClone.h",
- "external/spidermonkey/include/android/js/TracingAPI.h",
- "external/spidermonkey/include/android/js/TypeDecls.h",
- "external/spidermonkey/include/android/js/UbiNode.h",
- "external/spidermonkey/include/android/js/UbiNodeTraverse.h",
- "external/spidermonkey/include/android/js/Utility.h",
- "external/spidermonkey/include/android/js/Value.h",
- "external/spidermonkey/include/android/js/Vector.h",
- "external/spidermonkey/include/android/js/WeakMapPtr.h",
- "external/spidermonkey/include/android/jsalloc.h",
- "external/spidermonkey/include/android/jsapi.h",
- "external/spidermonkey/include/android/jsbytecode.h",
- "external/spidermonkey/include/android/jsclist.h",
- "external/spidermonkey/include/android/jscpucfg.h",
- "external/spidermonkey/include/android/jsfriendapi.h",
- "external/spidermonkey/include/android/jsperf.h",
- "external/spidermonkey/include/android/jsprf.h",
- "external/spidermonkey/include/android/jsprototypes.h",
- "external/spidermonkey/include/android/jsproxy.h",
- "external/spidermonkey/include/android/jspubtd.h",
- "external/spidermonkey/include/android/jstypes.h",
- "external/spidermonkey/include/android/jsversion.h",
- "external/spidermonkey/include/android/jswrapper.h",
- "external/spidermonkey/include/android/mozilla/Alignment.h",
- "external/spidermonkey/include/android/mozilla/AllocPolicy.h",
- "external/spidermonkey/include/android/mozilla/Array.h",
- "external/spidermonkey/include/android/mozilla/ArrayUtils.h",
- "external/spidermonkey/include/android/mozilla/Assertions.h",
- "external/spidermonkey/include/android/mozilla/Atomics.h",
- "external/spidermonkey/include/android/mozilla/Attributes.h",
- "external/spidermonkey/include/android/mozilla/BinarySearch.h",
- "external/spidermonkey/include/android/mozilla/BloomFilter.h",
- "external/spidermonkey/include/android/mozilla/Casting.h",
- "external/spidermonkey/include/android/mozilla/ChaosMode.h",
- "external/spidermonkey/include/android/mozilla/Char16.h",
- "external/spidermonkey/include/android/mozilla/CheckedInt.h",
- "external/spidermonkey/include/android/mozilla/Compiler.h",
- "external/spidermonkey/include/android/mozilla/Compression.h",
- "external/spidermonkey/include/android/mozilla/Constants.h",
- "external/spidermonkey/include/android/mozilla/DebugOnly.h",
- "external/spidermonkey/include/android/mozilla/Decimal.h",
- "external/spidermonkey/include/android/mozilla/Endian.h",
- "external/spidermonkey/include/android/mozilla/EnumSet.h",
- "external/spidermonkey/include/android/mozilla/EnumeratedArray.h",
- "external/spidermonkey/include/android/mozilla/FloatingPoint.h",
- "external/spidermonkey/include/android/mozilla/GuardObjects.h",
- "external/spidermonkey/include/android/mozilla/HashFunctions.h",
- "external/spidermonkey/include/android/mozilla/IntegerPrintfMacros.h",
- "external/spidermonkey/include/android/mozilla/IntegerTypeTraits.h",
- "external/spidermonkey/include/android/mozilla/Likely.h",
- "external/spidermonkey/include/android/mozilla/LinkedList.h",
- "external/spidermonkey/include/android/mozilla/LinuxSignal.h",
- "external/spidermonkey/include/android/mozilla/MSIntTypes.h",
- "external/spidermonkey/include/android/mozilla/MacroArgs.h",
- "external/spidermonkey/include/android/mozilla/MacroForEach.h",
- "external/spidermonkey/include/android/mozilla/MathAlgorithms.h",
- "external/spidermonkey/include/android/mozilla/Maybe.h",
- "external/spidermonkey/include/android/mozilla/MaybeOneOf.h",
- "external/spidermonkey/include/android/mozilla/MemoryChecking.h",
- "external/spidermonkey/include/android/mozilla/MemoryReporting.h",
- "external/spidermonkey/include/android/mozilla/Move.h",
- "external/spidermonkey/include/android/mozilla/NullPtr.h",
- "external/spidermonkey/include/android/mozilla/NumericLimits.h",
- "external/spidermonkey/include/android/mozilla/Pair.h",
- "external/spidermonkey/include/android/mozilla/PodOperations.h",
- "external/spidermonkey/include/android/mozilla/Poison.h",
- "external/spidermonkey/include/android/mozilla/Range.h",
- "external/spidermonkey/include/android/mozilla/RangedPtr.h",
- "external/spidermonkey/include/android/mozilla/ReentrancyGuard.h",
- "external/spidermonkey/include/android/mozilla/RefCountType.h",
- "external/spidermonkey/include/android/mozilla/RefPtr.h",
- "external/spidermonkey/include/android/mozilla/RollingMean.h",
- "external/spidermonkey/include/android/mozilla/SHA1.h",
- "external/spidermonkey/include/android/mozilla/Scoped.h",
- "external/spidermonkey/include/android/mozilla/SplayTree.h",
- "external/spidermonkey/include/android/mozilla/TaggedAnonymousMemory.h",
- "external/spidermonkey/include/android/mozilla/TemplateLib.h",
- "external/spidermonkey/include/android/mozilla/ThreadLocal.h",
- "external/spidermonkey/include/android/mozilla/ToString.h",
- "external/spidermonkey/include/android/mozilla/TypeTraits.h",
- "external/spidermonkey/include/android/mozilla/TypedEnum.h",
- "external/spidermonkey/include/android/mozilla/TypedEnumBits.h",
- "external/spidermonkey/include/android/mozilla/TypedEnumInternal.h",
- "external/spidermonkey/include/android/mozilla/Types.h",
- "external/spidermonkey/include/android/mozilla/UniquePtr.h",
- "external/spidermonkey/include/android/mozilla/Vector.h",
- "external/spidermonkey/include/android/mozilla/WeakPtr.h",
- "external/spidermonkey/include/ios/js-config-32.h",
- "external/spidermonkey/include/ios/js-config-64.h",
- "external/spidermonkey/include/ios/js-config.h",
- "external/spidermonkey/include/ios/js.msg",
- "external/spidermonkey/include/ios/js/Anchor.h",
- "external/spidermonkey/include/ios/js/CallArgs.h",
- "external/spidermonkey/include/ios/js/CallNonGenericMethod.h",
- "external/spidermonkey/include/ios/js/CharacterEncoding.h",
- "external/spidermonkey/include/ios/js/Class.h",
- "external/spidermonkey/include/ios/js/Date.h",
- "external/spidermonkey/include/ios/js/GCAPI.h",
- "external/spidermonkey/include/ios/js/HashTable.h",
- "external/spidermonkey/include/ios/js/HeapAPI.h",
- "external/spidermonkey/include/ios/js/Id.h",
- "external/spidermonkey/include/ios/js/LegacyIntTypes.h",
- "external/spidermonkey/include/ios/js/MemoryMetrics.h",
- "external/spidermonkey/include/ios/js/OldDebugAPI.h",
- "external/spidermonkey/include/ios/js/Principals.h",
- "external/spidermonkey/include/ios/js/ProfilingStack.h",
- "external/spidermonkey/include/ios/js/PropertyKey.h",
- "external/spidermonkey/include/ios/js/RequiredDefines.h",
- "external/spidermonkey/include/ios/js/RootingAPI.h",
- "external/spidermonkey/include/ios/js/SliceBudget.h",
- "external/spidermonkey/include/ios/js/StructuredClone.h",
- "external/spidermonkey/include/ios/js/TracingAPI.h",
- "external/spidermonkey/include/ios/js/TypeDecls.h",
- "external/spidermonkey/include/ios/js/UbiNode.h",
- "external/spidermonkey/include/ios/js/UbiNodeTraverse.h",
- "external/spidermonkey/include/ios/js/Utility.h",
- "external/spidermonkey/include/ios/js/Value.h",
- "external/spidermonkey/include/ios/js/Vector.h",
- "external/spidermonkey/include/ios/js/WeakMapPtr.h",
- "external/spidermonkey/include/ios/jsalloc.h",
- "external/spidermonkey/include/ios/jsapi.h",
- "external/spidermonkey/include/ios/jsbytecode.h",
- "external/spidermonkey/include/ios/jsclist.h",
- "external/spidermonkey/include/ios/jscpucfg.h",
- "external/spidermonkey/include/ios/jsfriendapi.h",
- "external/spidermonkey/include/ios/jsperf.h",
- "external/spidermonkey/include/ios/jsprf.h",
- "external/spidermonkey/include/ios/jsprototypes.h",
- "external/spidermonkey/include/ios/jsproxy.h",
- "external/spidermonkey/include/ios/jspubtd.h",
- "external/spidermonkey/include/ios/jstypes.h",
- "external/spidermonkey/include/ios/jsversion.h",
- "external/spidermonkey/include/ios/jswrapper.h",
- "external/spidermonkey/include/ios/mozilla/Alignment.h",
- "external/spidermonkey/include/ios/mozilla/AllocPolicy.h",
- "external/spidermonkey/include/ios/mozilla/Array.h",
- "external/spidermonkey/include/ios/mozilla/ArrayUtils.h",
- "external/spidermonkey/include/ios/mozilla/Assertions.h",
- "external/spidermonkey/include/ios/mozilla/Atomics.h",
- "external/spidermonkey/include/ios/mozilla/Attributes.h",
- "external/spidermonkey/include/ios/mozilla/BinarySearch.h",
- "external/spidermonkey/include/ios/mozilla/BloomFilter.h",
- "external/spidermonkey/include/ios/mozilla/Casting.h",
- "external/spidermonkey/include/ios/mozilla/ChaosMode.h",
- "external/spidermonkey/include/ios/mozilla/Char16.h",
- "external/spidermonkey/include/ios/mozilla/CheckedInt.h",
- "external/spidermonkey/include/ios/mozilla/Compiler.h",
- "external/spidermonkey/include/ios/mozilla/Compression.h",
- "external/spidermonkey/include/ios/mozilla/Constants.h",
- "external/spidermonkey/include/ios/mozilla/DebugOnly.h",
- "external/spidermonkey/include/ios/mozilla/Decimal.h",
- "external/spidermonkey/include/ios/mozilla/Endian.h",
- "external/spidermonkey/include/ios/mozilla/EnumSet.h",
- "external/spidermonkey/include/ios/mozilla/EnumeratedArray.h",
- "external/spidermonkey/include/ios/mozilla/FloatingPoint.h",
- "external/spidermonkey/include/ios/mozilla/GuardObjects.h",
- "external/spidermonkey/include/ios/mozilla/HashFunctions.h",
- "external/spidermonkey/include/ios/mozilla/IntegerPrintfMacros.h",
- "external/spidermonkey/include/ios/mozilla/IntegerTypeTraits.h",
- "external/spidermonkey/include/ios/mozilla/Likely.h",
- "external/spidermonkey/include/ios/mozilla/LinkedList.h",
- "external/spidermonkey/include/ios/mozilla/MSIntTypes.h",
- "external/spidermonkey/include/ios/mozilla/MacroArgs.h",
- "external/spidermonkey/include/ios/mozilla/MacroForEach.h",
- "external/spidermonkey/include/ios/mozilla/MathAlgorithms.h",
- "external/spidermonkey/include/ios/mozilla/Maybe.h",
- "external/spidermonkey/include/ios/mozilla/MaybeOneOf.h",
- "external/spidermonkey/include/ios/mozilla/MemoryChecking.h",
- "external/spidermonkey/include/ios/mozilla/MemoryReporting.h",
- "external/spidermonkey/include/ios/mozilla/Move.h",
- "external/spidermonkey/include/ios/mozilla/NullPtr.h",
- "external/spidermonkey/include/ios/mozilla/NumericLimits.h",
- "external/spidermonkey/include/ios/mozilla/Pair.h",
- "external/spidermonkey/include/ios/mozilla/PodOperations.h",
- "external/spidermonkey/include/ios/mozilla/Poison.h",
- "external/spidermonkey/include/ios/mozilla/Range.h",
- "external/spidermonkey/include/ios/mozilla/RangedPtr.h",
- "external/spidermonkey/include/ios/mozilla/ReentrancyGuard.h",
- "external/spidermonkey/include/ios/mozilla/RefCountType.h",
- "external/spidermonkey/include/ios/mozilla/RefPtr.h",
- "external/spidermonkey/include/ios/mozilla/RollingMean.h",
- "external/spidermonkey/include/ios/mozilla/SHA1.h",
- "external/spidermonkey/include/ios/mozilla/Scoped.h",
- "external/spidermonkey/include/ios/mozilla/SplayTree.h",
- "external/spidermonkey/include/ios/mozilla/TaggedAnonymousMemory.h",
- "external/spidermonkey/include/ios/mozilla/TemplateLib.h",
- "external/spidermonkey/include/ios/mozilla/ThreadLocal.h",
- "external/spidermonkey/include/ios/mozilla/ToString.h",
- "external/spidermonkey/include/ios/mozilla/TypeTraits.h",
- "external/spidermonkey/include/ios/mozilla/TypedEnum.h",
- "external/spidermonkey/include/ios/mozilla/TypedEnumBits.h",
- "external/spidermonkey/include/ios/mozilla/TypedEnumInternal.h",
- "external/spidermonkey/include/ios/mozilla/Types.h",
- "external/spidermonkey/include/ios/mozilla/UniquePtr.h",
- "external/spidermonkey/include/ios/mozilla/Vector.h",
- "external/spidermonkey/include/ios/mozilla/WeakPtr.h",
- "external/spidermonkey/include/linux/js-config.h",
- "external/spidermonkey/include/linux/js.msg",
- "external/spidermonkey/include/linux/js/Anchor.h",
- "external/spidermonkey/include/linux/js/CallArgs.h",
- "external/spidermonkey/include/linux/js/CallNonGenericMethod.h",
- "external/spidermonkey/include/linux/js/CharacterEncoding.h",
- "external/spidermonkey/include/linux/js/Class.h",
- "external/spidermonkey/include/linux/js/Date.h",
- "external/spidermonkey/include/linux/js/GCAPI.h",
- "external/spidermonkey/include/linux/js/HashTable.h",
- "external/spidermonkey/include/linux/js/HeapAPI.h",
- "external/spidermonkey/include/linux/js/Id.h",
- "external/spidermonkey/include/linux/js/LegacyIntTypes.h",
- "external/spidermonkey/include/linux/js/MemoryMetrics.h",
- "external/spidermonkey/include/linux/js/OldDebugAPI.h",
- "external/spidermonkey/include/linux/js/Principals.h",
- "external/spidermonkey/include/linux/js/ProfilingStack.h",
- "external/spidermonkey/include/linux/js/PropertyKey.h",
- "external/spidermonkey/include/linux/js/RequiredDefines.h",
- "external/spidermonkey/include/linux/js/RootingAPI.h",
- "external/spidermonkey/include/linux/js/SliceBudget.h",
- "external/spidermonkey/include/linux/js/StructuredClone.h",
- "external/spidermonkey/include/linux/js/TracingAPI.h",
- "external/spidermonkey/include/linux/js/TypeDecls.h",
- "external/spidermonkey/include/linux/js/UbiNode.h",
- "external/spidermonkey/include/linux/js/UbiNodeTraverse.h",
- "external/spidermonkey/include/linux/js/Utility.h",
- "external/spidermonkey/include/linux/js/Value.h",
- "external/spidermonkey/include/linux/js/Vector.h",
- "external/spidermonkey/include/linux/js/WeakMapPtr.h",
- "external/spidermonkey/include/linux/jsalloc.h",
- "external/spidermonkey/include/linux/jsapi.h",
- "external/spidermonkey/include/linux/jsbytecode.h",
- "external/spidermonkey/include/linux/jsclist.h",
- "external/spidermonkey/include/linux/jscpucfg.h",
- "external/spidermonkey/include/linux/jsfriendapi.h",
- "external/spidermonkey/include/linux/jsperf.h",
- "external/spidermonkey/include/linux/jsprf.h",
- "external/spidermonkey/include/linux/jsprototypes.h",
- "external/spidermonkey/include/linux/jsproxy.h",
- "external/spidermonkey/include/linux/jspubtd.h",
- "external/spidermonkey/include/linux/jstypes.h",
- "external/spidermonkey/include/linux/jsversion.h",
- "external/spidermonkey/include/linux/jswrapper.h",
- "external/spidermonkey/include/linux/mozilla/Alignment.h",
- "external/spidermonkey/include/linux/mozilla/AllocPolicy.h",
- "external/spidermonkey/include/linux/mozilla/Array.h",
- "external/spidermonkey/include/linux/mozilla/ArrayUtils.h",
- "external/spidermonkey/include/linux/mozilla/Assertions.h",
- "external/spidermonkey/include/linux/mozilla/Atomics.h",
- "external/spidermonkey/include/linux/mozilla/Attributes.h",
- "external/spidermonkey/include/linux/mozilla/BinarySearch.h",
- "external/spidermonkey/include/linux/mozilla/BloomFilter.h",
- "external/spidermonkey/include/linux/mozilla/Casting.h",
- "external/spidermonkey/include/linux/mozilla/ChaosMode.h",
- "external/spidermonkey/include/linux/mozilla/Char16.h",
- "external/spidermonkey/include/linux/mozilla/CheckedInt.h",
- "external/spidermonkey/include/linux/mozilla/Compiler.h",
- "external/spidermonkey/include/linux/mozilla/Compression.h",
- "external/spidermonkey/include/linux/mozilla/Constants.h",
- "external/spidermonkey/include/linux/mozilla/DebugOnly.h",
- "external/spidermonkey/include/linux/mozilla/Decimal.h",
- "external/spidermonkey/include/linux/mozilla/Endian.h",
- "external/spidermonkey/include/linux/mozilla/EnumSet.h",
- "external/spidermonkey/include/linux/mozilla/EnumeratedArray.h",
- "external/spidermonkey/include/linux/mozilla/FloatingPoint.h",
- "external/spidermonkey/include/linux/mozilla/GuardObjects.h",
- "external/spidermonkey/include/linux/mozilla/HashFunctions.h",
- "external/spidermonkey/include/linux/mozilla/IntegerPrintfMacros.h",
- "external/spidermonkey/include/linux/mozilla/IntegerTypeTraits.h",
- "external/spidermonkey/include/linux/mozilla/Likely.h",
- "external/spidermonkey/include/linux/mozilla/LinkedList.h",
- "external/spidermonkey/include/linux/mozilla/LinuxSignal.h",
- "external/spidermonkey/include/linux/mozilla/MSIntTypes.h",
- "external/spidermonkey/include/linux/mozilla/MacroArgs.h",
- "external/spidermonkey/include/linux/mozilla/MacroForEach.h",
- "external/spidermonkey/include/linux/mozilla/MathAlgorithms.h",
- "external/spidermonkey/include/linux/mozilla/Maybe.h",
- "external/spidermonkey/include/linux/mozilla/MaybeOneOf.h",
- "external/spidermonkey/include/linux/mozilla/MemoryChecking.h",
- "external/spidermonkey/include/linux/mozilla/MemoryReporting.h",
- "external/spidermonkey/include/linux/mozilla/Move.h",
- "external/spidermonkey/include/linux/mozilla/NullPtr.h",
- "external/spidermonkey/include/linux/mozilla/NumericLimits.h",
- "external/spidermonkey/include/linux/mozilla/Pair.h",
- "external/spidermonkey/include/linux/mozilla/PodOperations.h",
- "external/spidermonkey/include/linux/mozilla/Poison.h",
- "external/spidermonkey/include/linux/mozilla/Range.h",
- "external/spidermonkey/include/linux/mozilla/RangedPtr.h",
- "external/spidermonkey/include/linux/mozilla/ReentrancyGuard.h",
- "external/spidermonkey/include/linux/mozilla/RefCountType.h",
- "external/spidermonkey/include/linux/mozilla/RefPtr.h",
- "external/spidermonkey/include/linux/mozilla/RollingMean.h",
- "external/spidermonkey/include/linux/mozilla/SHA1.h",
- "external/spidermonkey/include/linux/mozilla/Scoped.h",
- "external/spidermonkey/include/linux/mozilla/SplayTree.h",
- "external/spidermonkey/include/linux/mozilla/TaggedAnonymousMemory.h",
- "external/spidermonkey/include/linux/mozilla/TemplateLib.h",
- "external/spidermonkey/include/linux/mozilla/ThreadLocal.h",
- "external/spidermonkey/include/linux/mozilla/ToString.h",
- "external/spidermonkey/include/linux/mozilla/TypeTraits.h",
- "external/spidermonkey/include/linux/mozilla/TypedEnum.h",
- "external/spidermonkey/include/linux/mozilla/TypedEnumBits.h",
- "external/spidermonkey/include/linux/mozilla/TypedEnumInternal.h",
- "external/spidermonkey/include/linux/mozilla/Types.h",
- "external/spidermonkey/include/linux/mozilla/UniquePtr.h",
- "external/spidermonkey/include/linux/mozilla/Vector.h",
- "external/spidermonkey/include/linux/mozilla/WeakPtr.h",
- "external/spidermonkey/include/mac/js-config.h",
- "external/spidermonkey/include/mac/js.msg",
- "external/spidermonkey/include/mac/js/Anchor.h",
- "external/spidermonkey/include/mac/js/CallArgs.h",
- "external/spidermonkey/include/mac/js/CallNonGenericMethod.h",
- "external/spidermonkey/include/mac/js/CharacterEncoding.h",
- "external/spidermonkey/include/mac/js/Class.h",
- "external/spidermonkey/include/mac/js/Date.h",
- "external/spidermonkey/include/mac/js/GCAPI.h",
- "external/spidermonkey/include/mac/js/HashTable.h",
- "external/spidermonkey/include/mac/js/HeapAPI.h",
- "external/spidermonkey/include/mac/js/Id.h",
- "external/spidermonkey/include/mac/js/LegacyIntTypes.h",
- "external/spidermonkey/include/mac/js/MemoryMetrics.h",
- "external/spidermonkey/include/mac/js/OldDebugAPI.h",
- "external/spidermonkey/include/mac/js/Principals.h",
- "external/spidermonkey/include/mac/js/ProfilingStack.h",
- "external/spidermonkey/include/mac/js/PropertyKey.h",
- "external/spidermonkey/include/mac/js/RequiredDefines.h",
- "external/spidermonkey/include/mac/js/RootingAPI.h",
- "external/spidermonkey/include/mac/js/SliceBudget.h",
- "external/spidermonkey/include/mac/js/StructuredClone.h",
- "external/spidermonkey/include/mac/js/TracingAPI.h",
- "external/spidermonkey/include/mac/js/TypeDecls.h",
- "external/spidermonkey/include/mac/js/UbiNode.h",
- "external/spidermonkey/include/mac/js/UbiNodeTraverse.h",
- "external/spidermonkey/include/mac/js/Utility.h",
- "external/spidermonkey/include/mac/js/Value.h",
- "external/spidermonkey/include/mac/js/Vector.h",
- "external/spidermonkey/include/mac/js/WeakMapPtr.h",
- "external/spidermonkey/include/mac/jsalloc.h",
- "external/spidermonkey/include/mac/jsapi.h",
- "external/spidermonkey/include/mac/jsbytecode.h",
- "external/spidermonkey/include/mac/jsclist.h",
- "external/spidermonkey/include/mac/jscpucfg.h",
- "external/spidermonkey/include/mac/jsfriendapi.h",
- "external/spidermonkey/include/mac/jsperf.h",
- "external/spidermonkey/include/mac/jsprf.h",
- "external/spidermonkey/include/mac/jsprototypes.h",
- "external/spidermonkey/include/mac/jsproxy.h",
- "external/spidermonkey/include/mac/jspubtd.h",
- "external/spidermonkey/include/mac/jstypes.h",
- "external/spidermonkey/include/mac/jsversion.h",
- "external/spidermonkey/include/mac/jswrapper.h",
- "external/spidermonkey/include/mac/mozilla/Alignment.h",
- "external/spidermonkey/include/mac/mozilla/AllocPolicy.h",
- "external/spidermonkey/include/mac/mozilla/Array.h",
- "external/spidermonkey/include/mac/mozilla/ArrayUtils.h",
- "external/spidermonkey/include/mac/mozilla/Assertions.h",
- "external/spidermonkey/include/mac/mozilla/Atomics.h",
- "external/spidermonkey/include/mac/mozilla/Attributes.h",
- "external/spidermonkey/include/mac/mozilla/BinarySearch.h",
- "external/spidermonkey/include/mac/mozilla/BloomFilter.h",
- "external/spidermonkey/include/mac/mozilla/Casting.h",
- "external/spidermonkey/include/mac/mozilla/ChaosMode.h",
- "external/spidermonkey/include/mac/mozilla/Char16.h",
- "external/spidermonkey/include/mac/mozilla/CheckedInt.h",
- "external/spidermonkey/include/mac/mozilla/Compiler.h",
- "external/spidermonkey/include/mac/mozilla/Compression.h",
- "external/spidermonkey/include/mac/mozilla/Constants.h",
- "external/spidermonkey/include/mac/mozilla/DebugOnly.h",
- "external/spidermonkey/include/mac/mozilla/Decimal.h",
- "external/spidermonkey/include/mac/mozilla/Endian.h",
- "external/spidermonkey/include/mac/mozilla/EnumSet.h",
- "external/spidermonkey/include/mac/mozilla/EnumeratedArray.h",
- "external/spidermonkey/include/mac/mozilla/FloatingPoint.h",
- "external/spidermonkey/include/mac/mozilla/GuardObjects.h",
- "external/spidermonkey/include/mac/mozilla/HashFunctions.h",
- "external/spidermonkey/include/mac/mozilla/IntegerPrintfMacros.h",
- "external/spidermonkey/include/mac/mozilla/IntegerTypeTraits.h",
- "external/spidermonkey/include/mac/mozilla/Likely.h",
- "external/spidermonkey/include/mac/mozilla/LinkedList.h",
- "external/spidermonkey/include/mac/mozilla/MSIntTypes.h",
- "external/spidermonkey/include/mac/mozilla/MacroArgs.h",
- "external/spidermonkey/include/mac/mozilla/MacroForEach.h",
- "external/spidermonkey/include/mac/mozilla/MathAlgorithms.h",
- "external/spidermonkey/include/mac/mozilla/Maybe.h",
- "external/spidermonkey/include/mac/mozilla/MaybeOneOf.h",
- "external/spidermonkey/include/mac/mozilla/MemoryChecking.h",
- "external/spidermonkey/include/mac/mozilla/MemoryReporting.h",
- "external/spidermonkey/include/mac/mozilla/Move.h",
- "external/spidermonkey/include/mac/mozilla/NullPtr.h",
- "external/spidermonkey/include/mac/mozilla/NumericLimits.h",
- "external/spidermonkey/include/mac/mozilla/Pair.h",
- "external/spidermonkey/include/mac/mozilla/PodOperations.h",
- "external/spidermonkey/include/mac/mozilla/Poison.h",
- "external/spidermonkey/include/mac/mozilla/Range.h",
- "external/spidermonkey/include/mac/mozilla/RangedPtr.h",
- "external/spidermonkey/include/mac/mozilla/ReentrancyGuard.h",
- "external/spidermonkey/include/mac/mozilla/RefCountType.h",
- "external/spidermonkey/include/mac/mozilla/RefPtr.h",
- "external/spidermonkey/include/mac/mozilla/RollingMean.h",
- "external/spidermonkey/include/mac/mozilla/SHA1.h",
- "external/spidermonkey/include/mac/mozilla/Scoped.h",
- "external/spidermonkey/include/mac/mozilla/SplayTree.h",
- "external/spidermonkey/include/mac/mozilla/TaggedAnonymousMemory.h",
- "external/spidermonkey/include/mac/mozilla/TemplateLib.h",
- "external/spidermonkey/include/mac/mozilla/ThreadLocal.h",
- "external/spidermonkey/include/mac/mozilla/ToString.h",
- "external/spidermonkey/include/mac/mozilla/TypeTraits.h",
- "external/spidermonkey/include/mac/mozilla/TypedEnum.h",
- "external/spidermonkey/include/mac/mozilla/TypedEnumBits.h",
- "external/spidermonkey/include/mac/mozilla/TypedEnumInternal.h",
- "external/spidermonkey/include/mac/mozilla/Types.h",
- "external/spidermonkey/include/mac/mozilla/UniquePtr.h",
- "external/spidermonkey/include/mac/mozilla/Vector.h",
- "external/spidermonkey/include/mac/mozilla/WeakPtr.h",
- "external/spidermonkey/include/win32/js-config.h",
- "external/spidermonkey/include/win32/js.msg",
- "external/spidermonkey/include/win32/js/Anchor.h",
- "external/spidermonkey/include/win32/js/CallArgs.h",
- "external/spidermonkey/include/win32/js/CallNonGenericMethod.h",
- "external/spidermonkey/include/win32/js/CharacterEncoding.h",
- "external/spidermonkey/include/win32/js/Class.h",
- "external/spidermonkey/include/win32/js/Date.h",
- "external/spidermonkey/include/win32/js/GCAPI.h",
- "external/spidermonkey/include/win32/js/HashTable.h",
- "external/spidermonkey/include/win32/js/HeapAPI.h",
- "external/spidermonkey/include/win32/js/Id.h",
- "external/spidermonkey/include/win32/js/LegacyIntTypes.h",
- "external/spidermonkey/include/win32/js/MemoryMetrics.h",
- "external/spidermonkey/include/win32/js/OldDebugAPI.h",
- "external/spidermonkey/include/win32/js/Principals.h",
- "external/spidermonkey/include/win32/js/ProfilingStack.h",
- "external/spidermonkey/include/win32/js/PropertyKey.h",
- "external/spidermonkey/include/win32/js/RequiredDefines.h",
- "external/spidermonkey/include/win32/js/RootingAPI.h",
- "external/spidermonkey/include/win32/js/SliceBudget.h",
- "external/spidermonkey/include/win32/js/StructuredClone.h",
- "external/spidermonkey/include/win32/js/TracingAPI.h",
- "external/spidermonkey/include/win32/js/TypeDecls.h",
- "external/spidermonkey/include/win32/js/UbiNode.h",
- "external/spidermonkey/include/win32/js/UbiNodeTraverse.h",
- "external/spidermonkey/include/win32/js/Utility.h",
- "external/spidermonkey/include/win32/js/Value.h",
- "external/spidermonkey/include/win32/js/Vector.h",
- "external/spidermonkey/include/win32/js/WeakMapPtr.h",
- "external/spidermonkey/include/win32/jsalloc.h",
- "external/spidermonkey/include/win32/jsapi.h",
- "external/spidermonkey/include/win32/jsbytecode.h",
- "external/spidermonkey/include/win32/jsclist.h",
- "external/spidermonkey/include/win32/jscpucfg.h",
- "external/spidermonkey/include/win32/jsfriendapi.h",
- "external/spidermonkey/include/win32/jsperf.h",
- "external/spidermonkey/include/win32/jsprf.h",
- "external/spidermonkey/include/win32/jsprototypes.h",
- "external/spidermonkey/include/win32/jsproxy.h",
- "external/spidermonkey/include/win32/jspubtd.h",
- "external/spidermonkey/include/win32/jstypes.h",
- "external/spidermonkey/include/win32/jsversion.h",
- "external/spidermonkey/include/win32/jswrapper.h",
- "external/spidermonkey/include/win32/mozilla/Alignment.h",
- "external/spidermonkey/include/win32/mozilla/AllocPolicy.h",
- "external/spidermonkey/include/win32/mozilla/Array.h",
- "external/spidermonkey/include/win32/mozilla/ArrayUtils.h",
- "external/spidermonkey/include/win32/mozilla/Assertions.h",
- "external/spidermonkey/include/win32/mozilla/Atomics.h",
- "external/spidermonkey/include/win32/mozilla/Attributes.h",
- "external/spidermonkey/include/win32/mozilla/BinarySearch.h",
- "external/spidermonkey/include/win32/mozilla/BloomFilter.h",
- "external/spidermonkey/include/win32/mozilla/Casting.h",
- "external/spidermonkey/include/win32/mozilla/ChaosMode.h",
- "external/spidermonkey/include/win32/mozilla/Char16.h",
- "external/spidermonkey/include/win32/mozilla/CheckedInt.h",
- "external/spidermonkey/include/win32/mozilla/Compiler.h",
- "external/spidermonkey/include/win32/mozilla/Compression.h",
- "external/spidermonkey/include/win32/mozilla/Constants.h",
- "external/spidermonkey/include/win32/mozilla/DebugOnly.h",
- "external/spidermonkey/include/win32/mozilla/Decimal.h",
- "external/spidermonkey/include/win32/mozilla/Endian.h",
- "external/spidermonkey/include/win32/mozilla/EnumSet.h",
- "external/spidermonkey/include/win32/mozilla/EnumeratedArray.h",
- "external/spidermonkey/include/win32/mozilla/FloatingPoint.h",
- "external/spidermonkey/include/win32/mozilla/GuardObjects.h",
- "external/spidermonkey/include/win32/mozilla/HashFunctions.h",
- "external/spidermonkey/include/win32/mozilla/IntegerPrintfMacros.h",
- "external/spidermonkey/include/win32/mozilla/IntegerTypeTraits.h",
- "external/spidermonkey/include/win32/mozilla/Likely.h",
- "external/spidermonkey/include/win32/mozilla/LinkedList.h",
- "external/spidermonkey/include/win32/mozilla/MSIntTypes.h",
- "external/spidermonkey/include/win32/mozilla/MacroArgs.h",
- "external/spidermonkey/include/win32/mozilla/MacroForEach.h",
- "external/spidermonkey/include/win32/mozilla/MathAlgorithms.h",
- "external/spidermonkey/include/win32/mozilla/Maybe.h",
- "external/spidermonkey/include/win32/mozilla/MaybeOneOf.h",
- "external/spidermonkey/include/win32/mozilla/MemoryChecking.h",
- "external/spidermonkey/include/win32/mozilla/MemoryReporting.h",
- "external/spidermonkey/include/win32/mozilla/Move.h",
- "external/spidermonkey/include/win32/mozilla/NullPtr.h",
- "external/spidermonkey/include/win32/mozilla/NumericLimits.h",
- "external/spidermonkey/include/win32/mozilla/Pair.h",
- "external/spidermonkey/include/win32/mozilla/PodOperations.h",
- "external/spidermonkey/include/win32/mozilla/Poison.h",
- "external/spidermonkey/include/win32/mozilla/Range.h",
- "external/spidermonkey/include/win32/mozilla/RangedPtr.h",
- "external/spidermonkey/include/win32/mozilla/ReentrancyGuard.h",
- "external/spidermonkey/include/win32/mozilla/RefCountType.h",
- "external/spidermonkey/include/win32/mozilla/RefPtr.h",
- "external/spidermonkey/include/win32/mozilla/RollingMean.h",
- "external/spidermonkey/include/win32/mozilla/SHA1.h",
- "external/spidermonkey/include/win32/mozilla/Scoped.h",
- "external/spidermonkey/include/win32/mozilla/SplayTree.h",
- "external/spidermonkey/include/win32/mozilla/TaggedAnonymousMemory.h",
- "external/spidermonkey/include/win32/mozilla/TemplateLib.h",
- "external/spidermonkey/include/win32/mozilla/ThreadLocal.h",
- "external/spidermonkey/include/win32/mozilla/ToString.h",
- "external/spidermonkey/include/win32/mozilla/TypeTraits.h",
- "external/spidermonkey/include/win32/mozilla/TypedEnum.h",
- "external/spidermonkey/include/win32/mozilla/TypedEnumBits.h",
- "external/spidermonkey/include/win32/mozilla/TypedEnumInternal.h",
- "external/spidermonkey/include/win32/mozilla/Types.h",
- "external/spidermonkey/include/win32/mozilla/UniquePtr.h",
- "external/spidermonkey/include/win32/mozilla/Vector.h",
- "external/spidermonkey/include/win32/mozilla/WeakPtr.h",
- "external/spidermonkey/include/win32/mozilla/WindowsVersion.h",
- "external/spidermonkey/include/win32/mozzconf.h",
- "external/spidermonkey/include/win32/zconf.h",
- "external/spidermonkey/include/win32/zlib.h",
- "external/spidermonkey/prebuilt/android/Android.mk",
- "external/spidermonkey/prebuilt/android/arm64-v8a/libjs_static.a",
- "external/spidermonkey/prebuilt/android/armeabi-v7a/libjs_static.a",
- "external/spidermonkey/prebuilt/android/x86/libjs_static.a",
- "external/spidermonkey/prebuilt/ios/libjs_static.a",
- "external/spidermonkey/prebuilt/linux/64-bit/libjs_static.a",
- "external/spidermonkey/prebuilt/mac/libjs_static.a",
- "external/spidermonkey/prebuilt/win32/mozjs-33.dll",
- "external/spidermonkey/prebuilt/win32/mozjs-33.lib",
- "tools/tojs/README.mdown",
- "tools/tojs/cocos2dx.ini",
- "tools/tojs/cocos2dx_3d.ini",
- "tools/tojs/cocos2dx_3d_ext.ini",
- "tools/tojs/cocos2dx_audioengine.ini",
- "tools/tojs/cocos2dx_builder.ini",
- "tools/tojs/cocos2dx_experimental_video.ini",
- "tools/tojs/cocos2dx_experimental_webView.ini",
- "tools/tojs/cocos2dx_extension.ini",
- "tools/tojs/cocos2dx_navmesh.ini",
- "tools/tojs/cocos2dx_network.ini",
- "tools/tojs/cocos2dx_physics3d.ini",
- "tools/tojs/cocos2dx_spine.ini",
- "tools/tojs/cocos2dx_studio.ini",
- "tools/tojs/cocos2dx_ui.ini",
- "tools/tojs/genbindings.py"
- ],
"lua": [
"cocos/scripting/lua-bindings/CMakeLists.txt",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp",
@@ -4572,8 +3850,8 @@
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_audioengine_auto.hpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp",
- "cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp",
- "cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp",
+ "cocos/scripting/lua-bindings/auto/lua_cocos2dx_backend_auto.cpp",
+ "cocos/scripting/lua-bindings/auto/lua_cocos2dx_backend_auto.hpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp",
"cocos/scripting/lua-bindings/auto/lua_cocos2dx_csloader_auto.cpp",
@@ -4627,8 +3905,6 @@
"cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp",
"cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp",
"cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp",
- "cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp",
- "cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h",
"cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.cpp",
"cocos/scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h",
"cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp",
@@ -4679,7 +3955,6 @@
"cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp",
"cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp",
"cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.hpp",
- "cocos/scripting/lua-bindings/proj.android/Android.mk",
"cocos/scripting/lua-bindings/proj.android/CMakeLists.txt",
"cocos/scripting/lua-bindings/script/3d/3dConstants.lua",
"cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua",
@@ -4695,8 +3970,6 @@
"cocos/scripting/lua-bindings/script/cocos2d/luaj.lua",
"cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua",
"cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua",
- "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua",
- "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua",
"cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua",
"cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua",
"cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua",
@@ -4888,6 +4161,7 @@
"tools/bindings-generator/targets/lua/templates/apidoc_function_overload.script",
"tools/bindings-generator/targets/lua/templates/apidoc_ns.script",
"tools/bindings-generator/targets/lua/templates/apidoc_ns_foot.script",
+ "tools/bindings-generator/targets/lua/templates/enum.c",
"tools/bindings-generator/targets/lua/templates/function.h",
"tools/bindings-generator/targets/lua/templates/ifunction.c",
"tools/bindings-generator/targets/lua/templates/ifunction_overloaded.c",
@@ -4939,7 +4213,7 @@
"tools/tolua/cocos2dx.ini",
"tools/tolua/cocos2dx_3d.ini",
"tools/tolua/cocos2dx_audioengine.ini",
- "tools/tolua/cocos2dx_cocosdenshion.ini",
+ "tools/tolua/cocos2dx_backend.ini",
"tools/tolua/cocos2dx_controller.ini",
"tools/tolua/cocos2dx_csloader.ini",
"tools/tolua/cocos2dx_experimental.ini",
@@ -4952,7 +4226,6 @@
"tools/tolua/cocos2dx_spine.ini",
"tools/tolua/cocos2dx_studio.ini",
"tools/tolua/cocos2dx_ui.ini",
- "tools/tolua/genbindings.py",
- "tools/tolua/userconf.ini"
+ "tools/tolua/genbindings.py"
]
}
\ No newline at end of file
diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt
index 056be0dd23..25416f543f 100644
--- a/templates/cpp-template-default/CMakeLists.txt
+++ b/templates/cpp-template-default/CMakeLists.txt
@@ -138,7 +138,7 @@ if(APPLE)
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist"
)
elseif(IOS)
- cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in")
+ cocos_pak_xcode(${APP_NAME} INFO_PLIST "${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")
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 03fd094df3..8b4aea8f9b 100644
--- a/templates/cpp-template-default/proj.ios_mac/ios/Info.plist
+++ b/templates/cpp-template-default/proj.ios_mac/ios/Info.plist
@@ -2,42 +2,46 @@
- CFBundleDevelopmentRegion
- English
- CFBundleDisplayName
- ${PRODUCT_NAME}
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
- Icon-57.png
- CFBundleIdentifier
- org.cocos2dx.hellocpp
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
-
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- LSRequiresIPhoneOS
-
- UIAppFonts
-
- UILaunchStoryboardName
- LaunchScreen
- UIPrerenderedIcon
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationLandscapeLeft
-
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDisplayName
+ ${PRODUCT_NAME}
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleIconFile
+ Icon-57.png
+ CFBundleIdentifier
+ org.cocos2dx.hellocpp
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundleLongVersionString
+ ${MACOSX_BUNDLE_LONG_VERSION_STRING}
+ CFBundleShortVersionString
+ ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
+ CFBundlePackageType
+ APPL
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ LSRequiresIPhoneOS
+
+ UIAppFonts
+
+ UILaunchStoryboardName
+ LaunchScreen
+ UIPrerenderedIcon
+
+ UIStatusBarHidden
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationLandscapeRight
+ UIInterfaceOrientationLandscapeLeft
+
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}
diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt
index 1ccacc16a7..603d238e99 100644
--- a/templates/lua-template-default/CMakeLists.txt
+++ b/templates/lua-template-default/CMakeLists.txt
@@ -138,7 +138,7 @@ if(APPLE)
MACOSX_BUNDLE_INFO_PLIST "${RUNTIME_SRC_ROOT}/proj.ios_mac/mac/Info.plist"
)
elseif(IOS)
- cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in")
+ cocos_pak_xcode(${APP_NAME} INFO_PLIST "${RUNTIME_SRC_ROOT}/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")
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 d1be19f832..503a22c369 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
@@ -2,45 +2,51 @@
- CFBundleDevelopmentRegion
- English
- CFBundleDisplayName
- ${PRODUCT_NAME}
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
- Icon-57.png
- CFBundleIdentifier
- org.cocos2dx.hellolua
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- LSRequiresIPhoneOS
-
- UILaunchStoryboardName
- LaunchScreen
- UIPrerenderedIcon
-
- UIRequiredDeviceCapabilities
-
- accelerometer
-
- opengles-1
-
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationLandscapeLeft
-
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDisplayName
+ ${PRODUCT_NAME}
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleIconFile
+ Icon-57.png
+ CFBundleIdentifier
+ org.cocos2dx.hellolua
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundleLongVersionString
+ ${MACOSX_BUNDLE_LONG_VERSION_STRING}
+ CFBundleShortVersionString
+ ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
+ CFBundlePackageType
+ APPL
+ CFBundleSignature
+ ????
+ LSRequiresIPhoneOS
+
+ UILaunchStoryboardName
+ LaunchScreen
+ UIPrerenderedIcon
+
+ UIRequiredDeviceCapabilities
+
+ accelerometer
+
+ opengles-1
+
+
+ UIStatusBarHidden
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationLandscapeRight
+ UIInterfaceOrientationLandscapeLeft
+
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}
diff --git a/tests/cpp-empty-test/CMakeLists.txt b/tests/cpp-empty-test/CMakeLists.txt
index 73e203a539..c809b3e587 100644
--- a/tests/cpp-empty-test/CMakeLists.txt
+++ b/tests/cpp-empty-test/CMakeLists.txt
@@ -133,7 +133,7 @@ if(APPLE)
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist"
)
elseif(IOS)
- cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in")
+ cocos_pak_xcode(${APP_NAME} INFO_PLIST "${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 "")
diff --git a/tests/cpp-empty-test/proj.ios/Info.plist b/tests/cpp-empty-test/proj.ios/Info.plist
index c0dc67bf44..935eac086d 100644
--- a/tests/cpp-empty-test/proj.ios/Info.plist
+++ b/tests/cpp-empty-test/proj.ios/Info.plist
@@ -2,52 +2,54 @@
- CFBundleDevelopmentRegion
- English
- CFBundleDisplayName
- ${PRODUCT_NAME}
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
- Icon-57.png
- CFBundleIconFiles
-
- Icon.png
- Icon@2x.png
- Icon-57.png
- Icon-114.png
- Icon-72.png
- Icon-144.png
-
- CFBundleIcons
-
- CFBundleIcons~ipad
-
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
-
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- LSRequiresIPhoneOS
-
- UILaunchStoryboardName
- LaunchScreen
- UIPrerenderedIcon
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationLandscapeRight
-
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDisplayName
+ ${PRODUCT_NAME}
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleIconFile
+ Icon-57.png
+ CFBundleIconFiles
+
+ Icon.png
+ Icon@2x.png
+ Icon-57.png
+ Icon-114.png
+ Icon-72.png
+ Icon-144.png
+
+ CFBundleIcons
+
+ CFBundleIcons~ipad
+
+ CFBundleIdentifier
+ ${MACOSX_BUNDLE_GUI_IDENTIFIER}
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ LSRequiresIPhoneOS
+
+ UILaunchStoryboardName
+ LaunchScreen
+ UIPrerenderedIcon
+
+ UIStatusBarHidden
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationLandscapeRight
+
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}
diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt
index fae437ee71..4a0e2544d8 100644
--- a/tests/cpp-tests/CMakeLists.txt
+++ b/tests/cpp-tests/CMakeLists.txt
@@ -466,18 +466,7 @@ if(APPLE)
)
elseif(IOS)
# set custom fonts
- set(GAME_CUSTOM_FONT)
- set(CUSTOM_FONT_LIST
- "fonts/A Damn Mess.ttf"
- "fonts/Abberancy.ttf"
- "fonts/Paint Boy.ttf"
- "fonts/Schwarzwald.ttf"
- "fonts/Scissor Cuts.ttf")
- foreach(font ${CUSTOM_FONT_LIST})
- string(APPEND GAME_CUSTOM_FONT "\n${font}")
- endforeach()
-
- cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in" CUSTOM_FONT ${GAME_CUSTOM_FONT})
+ cocos_pak_xcode(${APP_NAME} INFO_PLIST "${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")
diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist
index b15773f0ab..de23973588 100644
--- a/tests/cpp-tests/proj.ios/Info.plist
+++ b/tests/cpp-tests/proj.ios/Info.plist
@@ -2,54 +2,62 @@
- CFBundleDevelopmentRegion
- English
- CFBundleDisplayName
- ${PRODUCT_NAME}
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
- Icon-57.png
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
-
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- LSRequiresIPhoneOS
-
- NSAppTransportSecurity
-
- NSAllowsArbitraryLoads
-
-
- UIAppFonts
-
- fonts/A Damn Mess.ttf
- fonts/Abberancy.ttf
- fonts/Abduction.ttf
- fonts/Paint Boy.ttf
- fonts/Schwarzwald.ttf
- fonts/Scissor Cuts.ttf
-
- UILaunchStoryboardName
- LaunchScreen
- UIPrerenderedIcon
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationLandscapeLeft
-
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDisplayName
+ ${PRODUCT_NAME}
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleIconFile
+ ${MACOSX_BUNDLE_ICON_FILE}
+ CFBundleIdentifier
+ ${MACOSX_BUNDLE_GUI_IDENTIFIER}
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundlePackageType
+ APPL
+ CFBundleLongVersionString
+ ${MACOSX_BUNDLE_LONG_VERSION_STRING}
+ CFBundleShortVersionString
+ ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}
+ CFBundleIconFiles
+
+ ${MACOSX_BUNDLE_ICON_FILE}
+
+ LSRequiresIPhoneOS
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIAppFonts
+
+ fonts/A Damn Mess.ttf
+ fonts/Abberancy.ttf
+ fonts/Abduction.ttf
+ fonts/Paint Boy.ttf
+ fonts/Schwarzwald.ttf
+ fonts/Scissor Cuts.ttf
+
+ UILaunchStoryboardName
+ LaunchScreen
+ UIPrerenderedIcon
+
+ UIStatusBarHidden
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationLandscapeRight
+ UIInterfaceOrientationLandscapeLeft
+
diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt
index d499caddf5..8dd90bb2a4 100644
--- a/tests/lua-empty-test/project/CMakeLists.txt
+++ b/tests/lua-empty-test/project/CMakeLists.txt
@@ -105,7 +105,7 @@ if(APPLE)
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.mac/Info.plist"
)
elseif(IOS)
- cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in")
+ cocos_pak_xcode(${APP_NAME} INFO_PLIST "${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")
diff --git a/tests/lua-empty-test/project/proj.ios/Info.plist b/tests/lua-empty-test/project/proj.ios/Info.plist
index 4670d10df0..8efc91675c 100644
--- a/tests/lua-empty-test/project/proj.ios/Info.plist
+++ b/tests/lua-empty-test/project/proj.ios/Info.plist
@@ -2,49 +2,55 @@
- CFBundleDevelopmentRegion
- English
- CFBundleDisplayName
- ${PRODUCT_NAME}
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
- Icon-57.png
- CFBundleIcons
-
- CFBundleIcons~ipad
-
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- LSRequiresIPhoneOS
-
- UILaunchStoryboardName
- LaunchScreen
- UIPrerenderedIcon
-
- UIRequiredDeviceCapabilities
-
- accelerometer
-
- opengles-1
-
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationLandscapeLeft
-
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDisplayName
+ ${PRODUCT_NAME}
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleIconFile
+ Icon-57.png
+ CFBundleIcons
+
+ CFBundleIcons~ipad
+
+ CFBundleIdentifier
+ ${MACOSX_BUNDLE_GUI_IDENTIFIER}
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundlePackageType
+ APPL
+ CFBundleLongVersionString
+ ${MACOSX_BUNDLE_LONG_VERSION_STRING}
+ CFBundleShortVersionString
+ ${MACOSX_BUNDLE_SHORT_VERSION_STRING}
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}
+ LSRequiresIPhoneOS
+
+ UILaunchStoryboardName
+ LaunchScreen
+ UIPrerenderedIcon
+
+ UIRequiredDeviceCapabilities
+
+ accelerometer
+
+ opengles-1
+
+
+ UIStatusBarHidden
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationLandscapeRight
+ UIInterfaceOrientationLandscapeLeft
+
diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt
index 54b334d3d1..6c6927a3a3 100644
--- a/tests/lua-tests/project/CMakeLists.txt
+++ b/tests/lua-tests/project/CMakeLists.txt
@@ -113,7 +113,7 @@ if(APPLE)
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/proj.ios_mac/mac/Info.plist"
)
elseif(IOS)
- cocos_pak_xcode(${APP_NAME} INFO_PLIST "iOSBundleInfo.plist.in")
+ cocos_pak_xcode(${APP_NAME} INFO_PLIST "${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")
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 ffa0140885..64b0d48ad1 100644
--- a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist
+++ b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist
@@ -2,70 +2,72 @@
- CFBundleDevelopmentRegion
- English
- CFBundleDisplayName
- ${PRODUCT_NAME}
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIconFile
-
- CFBundleIconFiles
-
- Icon-57.png
- Icon-114.png
- Icon-72.png
- Icon-144.png
-
- CFBundleIcons
-
- CFBundleIcons~ipad
-
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ${PRODUCT_NAME}
- CFBundlePackageType
- APPL
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- LSRequiresIPhoneOS
-
- NSAppTransportSecurity
-
- NSAllowsArbitraryLoads
-
-
- UIAppFonts
-
- fonts/A Damn Mess.ttf
- fonts/Abberancy.ttf
- fonts/Abduction.ttf
- fonts/Paint Boy.ttf
- fonts/Schwarzwald.ttf
- fonts/Scissor Cuts.ttf
-
- UILaunchStoryboardName
- LaunchScreen
- UIPrerenderedIcon
-
- UIRequiredDeviceCapabilities
-
- accelerometer
-
- opengles-1
-
-
- UIStatusBarHidden
-
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationLandscapeRight
- UIInterfaceOrientationLandscapeLeft
-
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDisplayName
+ ${PRODUCT_NAME}
+ CFBundleExecutable
+ ${MACOSX_BUNDLE_EXECUTABLE_NAME}
+ CFBundleIconFile
+ ${MACOSX_BUNDLE_ICON_FILE}
+ CFBundleIconFiles
+
+ Icon-57.png
+ Icon-114.png
+ Icon-72.png
+ Icon-144.png
+
+ CFBundleIcons
+
+ CFBundleIcons~ipad
+
+ CFBundleIdentifier
+ ${MACOSX_BUNDLE_GUI_IDENTIFIER}
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ${MACOSX_BUNDLE_BUNDLE_NAME}
+ CFBundlePackageType
+ APPL
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ ${MACOSX_BUNDLE_BUNDLE_VERSION}
+ LSRequiresIPhoneOS
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
+ UIAppFonts
+
+ fonts/A Damn Mess.ttf
+ fonts/Abberancy.ttf
+ fonts/Abduction.ttf
+ fonts/Paint Boy.ttf
+ fonts/Schwarzwald.ttf
+ fonts/Scissor Cuts.ttf
+
+ UILaunchStoryboardName
+ LaunchScreen
+ UIPrerenderedIcon
+
+ UIRequiredDeviceCapabilities
+
+ accelerometer
+
+ opengles-1
+
+
+ UIStatusBarHidden
+
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationLandscapeRight
+ UIInterfaceOrientationLandscapeLeft
+
+ NSHumanReadableCopyright
+ ${MACOSX_BUNDLE_COPYRIGHT}