From 14a982b080c669d658a2ebcaf259afc730899178 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Fri, 30 Jun 2017 11:06:43 +0000 Subject: [PATCH] [AUTO][ci skip]: updating cocos2dx_files.json --- .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 10 +- .../js-bindings/auto/jsb_cocos2dx_auto.hpp | 134 +------ native/templates/cocos2dx_files.json | 333 +++++++++++++++--- 3 files changed, 296 insertions(+), 181 deletions(-) diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index fbebc2a9ef..ac2160ec6c 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -2492,12 +2492,11 @@ bool js_cocos2dx_Node_getChildren(JSContext *cx, uint32_t argc, JS::Value *vp) JS_ReportErrorUTF8(cx, "js_cocos2dx_Node_getChildren : arguments error"); return false; } -<<<<<<< HEAD -bool js_cocos2dx_Node_markTransformUpdated(JSContext *cx, uint32_t argc, jsval *vp) +bool js_cocos2dx_Node_markTransformUpdated(JSContext *cx, uint32_t argc, JS::Value *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); + js_proxy_t *proxy = jsb_get_js_proxy(cx, obj); cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_markTransformUpdated : Invalid Native Object"); if (argc == 0) { @@ -2506,13 +2505,10 @@ bool js_cocos2dx_Node_markTransformUpdated(JSContext *cx, uint32_t argc, jsval * return true; } - JS_ReportError(cx, "js_cocos2dx_Node_markTransformUpdated : wrong number of arguments: %d, was expecting %d", argc, 0); + JS_ReportErrorUTF8(cx, "js_cocos2dx_Node_markTransformUpdated : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } -bool js_cocos2dx_Node_setOnExitCallback(JSContext *cx, uint32_t argc, jsval *vp) -======= bool js_cocos2dx_Node_setOnExitCallback(JSContext *cx, uint32_t argc, JS::Value *vp) ->>>>>>> Upgrade to spider monkey 52, pass 1 { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); bool ok = true; CC_UNUSED_PARAM(ok); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index 795ea3c212..7df2c14d5e 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -135,138 +135,6 @@ bool js_cocos2dx_Node_constructor(JSContext *cx, uint32_t argc, JS::Value *vp); void js_cocos2dx_Node_finalize(JSContext *cx, JSObject *obj); void js_register_cocos2dx_Node(JSContext *cx, JS::HandleObject global); void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj); -<<<<<<< HEAD -bool js_cocos2dx_Node_addChild(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_removeComponent(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getGLProgram(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getDescription(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setOpacityModifyRGB(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setCascadeOpacityEnabled(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getChildren(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_markTransformUpdated(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setOnExitCallback(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_isIgnoreAnchorPointForPosition(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getChildByName(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_updateDisplayedOpacity(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_init(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getCameraMask(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setRotation(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setScaleZ(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setScaleY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setScaleX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getColor(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setonEnterTransitionDidFinishCallback(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_removeAllComponents(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node__setLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setCameraMask(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getTag(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setAfterVisitCallback(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getNodeToWorldAffineTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_removeChild(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getScene(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getEventDispatcher(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setSkewX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setGLProgramState(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setOnEnterCallback(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_stopActionsByFlags(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setNormalizedPosition(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setonExitTransitionDidStartCallback(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_convertTouchToNodeSpace(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_removeAllChildrenWithCleanup(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getRotationSkewX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getRotationSkewY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getNodeToWorldTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_isCascadeOpacityEnabled(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setParent(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getName(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getNodeToParentAffineTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_isOpacityModifyRGB(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_stopActionByTag(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_reorderChild(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setSkewY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setPositionY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setPositionX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setNodeToParentTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getAnchorPoint(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getNumberOfRunningActions(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_updateTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_isVisible(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getChildrenCount(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getNodeToParentTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_convertToNodeSpaceAR(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_addComponent(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_runAction(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setGLProgram(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getRotation(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getAnchorPointInPoints(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_visit(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_removeChildByName(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setPositionZ(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getGLProgramState(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setScheduler(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_stopAllActions(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getSkewX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getSkewY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_isScheduled(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getDisplayedColor(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getActionByTag(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setRotationSkewX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setRotationSkewY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setName(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getDisplayedOpacity(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getScheduler(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setBeforeVisitCallback(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setActionManager(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getPosition(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_insertChildBefore(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_isRunning(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getParent(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getWorldToNodeTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getPositionY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getPositionX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_removeChildByTag(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_updateDisplayedColor(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setVisible(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getParentToNodeAffineTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getPositionZ(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setGlobalZOrder(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setScale(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getChildByTag(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getScaleZ(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getScaleY(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getScaleX(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setCascadeColorEnabled(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setOpacity(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getComponent(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getContentSize(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_stopAllActionsByTag(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getBoundingBox(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setIgnoreAnchorPointForPosition(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setEventDispatcher(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getGlobalZOrder(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_draw(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setUserObject(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_enumerateChildren(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_removeFromParentAndCleanup(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_convertTouchToNodeSpaceAR(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_update(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_sortAllChildren(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getWorldToNodeAffineTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getScale(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getOpacity(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_updateOrderOfArrival(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getNormalizedPosition(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getParentToNodeTransform(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_convertToNodeSpace(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_setTag(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_isCascadeColorEnabled(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_stopAction(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_getActionManager(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_create(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_Node(JSContext *cx, uint32_t argc, jsval *vp); -======= bool js_cocos2dx_Node_addChild(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_removeComponent(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_getGLProgram(JSContext *cx, uint32_t argc, JS::Value *vp); @@ -274,6 +142,7 @@ bool js_cocos2dx_Node_getDescription(JSContext *cx, uint32_t argc, JS::Value *vp bool js_cocos2dx_Node_setOpacityModifyRGB(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_setCascadeOpacityEnabled(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_getChildren(JSContext *cx, uint32_t argc, JS::Value *vp); +bool js_cocos2dx_Node_markTransformUpdated(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_setOnExitCallback(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_isIgnoreAnchorPointForPosition(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_getChildByName(JSContext *cx, uint32_t argc, JS::Value *vp); @@ -396,7 +265,6 @@ bool js_cocos2dx_Node_stopAction(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_getActionManager(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_create(JSContext *cx, uint32_t argc, JS::Value *vp); bool js_cocos2dx_Node_Node(JSContext *cx, uint32_t argc, JS::Value *vp); ->>>>>>> Upgrade to spider monkey 52, pass 1 extern JSClass *jsb_cocos2d_Scene_class; extern JS::PersistentRootedObject *jsb_cocos2d_Scene_prototype; diff --git a/native/templates/cocos2dx_files.json b/native/templates/cocos2dx_files.json index a4a122350d..42dfb5d2ca 100644 --- a/native/templates/cocos2dx_files.json +++ b/native/templates/cocos2dx_files.json @@ -5,7 +5,6 @@ "auto-build.bat", "build/cocos2d-win32.sln", "build/cocos2d_libs.xcodeproj/project.pbxproj", - "build/cocos2d_libs.xcodeproj/project.xcworkspace/xcshareddata/cocos2d_libs.xcscmblueprint", "cocos/2d/CCAction.cpp", "cocos/2d/CCAction.h", "cocos/2d/CCActionCamera.cpp", @@ -212,7 +211,6 @@ "cocos/audio/android/jni/cddandroidAndroidJavaEngine.h", "cocos/audio/android/mp3reader.cpp", "cocos/audio/android/mp3reader.h", - "cocos/audio/android/prebuilt-mk/Android.mk", "cocos/audio/android/tinysndfile.cpp", "cocos/audio/android/tinysndfile.h", "cocos/audio/android/utils/Compat.h", @@ -429,7 +427,6 @@ "cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp", "cocos/editor-support/cocosbuilder/CCSpriteLoader.h", "cocos/editor-support/cocosbuilder/CocosBuilder.h", - "cocos/editor-support/cocosbuilder/prebuilt-mk/Android.mk", "cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp", "cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h", "cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineNode.cpp", @@ -516,7 +513,6 @@ "cocos/editor-support/cocostudio/DictionaryHelper.h", "cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.cpp", "cocos/editor-support/cocostudio/WidgetCallBackHandlerProtocol.h", - "cocos/editor-support/cocostudio/prebuilt-mk/Android.mk", "cocos/editor-support/creator/Android.mk", "cocos/editor-support/creator/CCCameraNode.cpp", "cocos/editor-support/creator/CCCameraNode.h", @@ -545,7 +541,6 @@ "cocos/editor-support/creator/physics/CCPhysicsUtils.h", "cocos/editor-support/creator/physics/CCPhysicsWorldManifoldWrapper.cpp", "cocos/editor-support/creator/physics/CCPhysicsWorldManifoldWrapper.h", - "cocos/editor-support/creator/prebuilt-mk/Android.mk", "cocos/editor-support/dragonbones/DragonBonesHeaders.h", "cocos/editor-support/dragonbones/animation/Animation.cpp", "cocos/editor-support/dragonbones/animation/Animation.h", @@ -601,7 +596,6 @@ "cocos/editor-support/dragonbones/parsers/JSONDataParser.cpp", "cocos/editor-support/dragonbones/parsers/JSONDataParser.h", "cocos/editor-support/dragonbones/proj.android/Android.mk", - "cocos/editor-support/dragonbones/proj.android/prebuilt-mk/Android.mk", "cocos/editor-support/dragonbones/proj.win32/libDragonBones.vcxproj", "cocos/editor-support/dragonbones/proj.win32/libDragonBones.vcxproj.filters", "cocos/editor-support/dragonbones/textures/TextureData.cpp", @@ -683,7 +677,6 @@ "cocos/editor-support/spine/extension.c", "cocos/editor-support/spine/extension.h", "cocos/editor-support/spine/kvec.h", - "cocos/editor-support/spine/prebuilt-mk/Android.mk", "cocos/editor-support/spine/proj.win32/libSpine.vcxproj", "cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters", "cocos/editor-support/spine/spine-cocos2dx.cpp", @@ -746,7 +739,6 @@ "cocos/network/Uri.h", "cocos/network/WebSocket.cpp", "cocos/network/WebSocket.h", - "cocos/network/prebuilt-mk/Android.mk", "cocos/platform/CCApplication.h", "cocos/platform/CCApplicationProtocol.h", "cocos/platform/CCCommon.h", @@ -843,9 +835,7 @@ "cocos/platform/android/libcocos2dx-with-controller/proguard-rules.pro", "cocos/platform/android/libcocos2dx/AndroidManifest.xml", "cocos/platform/android/libcocos2dx/build.gradle", - "cocos/platform/android/libcocos2dx/libcocos2dx.iml", "cocos/platform/android/libcocos2dx/proguard-rules.pro", - "cocos/platform/android/prebuilt-mk/Android.mk", "cocos/platform/apple/CCDevice-apple.h", "cocos/platform/apple/CCDevice-apple.mm", "cocos/platform/apple/CCFileUtils-apple.h", @@ -897,7 +887,6 @@ "cocos/platform/win32/compat/stdint.h", "cocos/platform/win32/inet_pton_mingw.cpp", "cocos/platform/win32/inet_pton_mingw.h", - "cocos/prebuilt-mk/Android.mk", "cocos/renderer/CCBatchCommand.cpp", "cocos/renderer/CCBatchCommand.h", "cocos/renderer/CCCustomCommand.cpp", @@ -1093,7 +1082,6 @@ "cocos/ui/UIWebViewImpl-ios.mm", "cocos/ui/UIWidget.cpp", "cocos/ui/UIWidget.h", - "cocos/ui/prebuilt-mk/Android.mk", "cocos/ui/proj.win32/libui.vcxproj", "cocos/ui/proj.win32/libui.vcxproj.filters", "download-deps.py", @@ -1163,7 +1151,6 @@ "extensions/physics-nodes/CCPhysicsDebugNode.h", "extensions/physics-nodes/CCPhysicsSprite.cpp", "extensions/physics-nodes/CCPhysicsSprite.h", - "extensions/prebuilt-mk/Android.mk", "external/android/Android.mk", "external/android/arm64-v8a/include/anysdk/AgentManager.h", "external/android/arm64-v8a/include/anysdk/JSBRelation.h", @@ -3943,32 +3930,49 @@ "external/win32/include/png/png.h", "external/win32/include/png/pngconf.h", "external/win32/include/png/pnglibconf.h", + "external/win32/include/spidermonkey/fdlibm.h", "external/win32/include/spidermonkey/js-config.h", "external/win32/include/spidermonkey/js.msg", - "external/win32/include/spidermonkey/js/Anchor.h", "external/win32/include/spidermonkey/js/CallArgs.h", "external/win32/include/spidermonkey/js/CallNonGenericMethod.h", "external/win32/include/spidermonkey/js/CharacterEncoding.h", "external/win32/include/spidermonkey/js/Class.h", + "external/win32/include/spidermonkey/js/Conversions.h", "external/win32/include/spidermonkey/js/Date.h", + "external/win32/include/spidermonkey/js/Debug.h", "external/win32/include/spidermonkey/js/GCAPI.h", + "external/win32/include/spidermonkey/js/GCAnnotations.h", + "external/win32/include/spidermonkey/js/GCHashTable.h", + "external/win32/include/spidermonkey/js/GCPolicyAPI.h", + "external/win32/include/spidermonkey/js/GCVariant.h", + "external/win32/include/spidermonkey/js/GCVector.h", "external/win32/include/spidermonkey/js/HashTable.h", "external/win32/include/spidermonkey/js/HeapAPI.h", "external/win32/include/spidermonkey/js/Id.h", + "external/win32/include/spidermonkey/js/Initialization.h", "external/win32/include/spidermonkey/js/LegacyIntTypes.h", "external/win32/include/spidermonkey/js/MemoryMetrics.h", - "external/win32/include/spidermonkey/js/OldDebugAPI.h", "external/win32/include/spidermonkey/js/Principals.h", + "external/win32/include/spidermonkey/js/ProfilingFrameIterator.h", "external/win32/include/spidermonkey/js/ProfilingStack.h", - "external/win32/include/spidermonkey/js/PropertyKey.h", + "external/win32/include/spidermonkey/js/Proxy.h", + "external/win32/include/spidermonkey/js/Realm.h", "external/win32/include/spidermonkey/js/RequiredDefines.h", "external/win32/include/spidermonkey/js/RootingAPI.h", "external/win32/include/spidermonkey/js/SliceBudget.h", "external/win32/include/spidermonkey/js/StructuredClone.h", + "external/win32/include/spidermonkey/js/SweepingAPI.h", + "external/win32/include/spidermonkey/js/TraceKind.h", "external/win32/include/spidermonkey/js/TracingAPI.h", + "external/win32/include/spidermonkey/js/TrackedOptimizationInfo.h", "external/win32/include/spidermonkey/js/TypeDecls.h", "external/win32/include/spidermonkey/js/UbiNode.h", - "external/win32/include/spidermonkey/js/UbiNodeTraverse.h", + "external/win32/include/spidermonkey/js/UbiNodeBreadthFirst.h", + "external/win32/include/spidermonkey/js/UbiNodeCensus.h", + "external/win32/include/spidermonkey/js/UbiNodeDominatorTree.h", + "external/win32/include/spidermonkey/js/UbiNodePostOrder.h", + "external/win32/include/spidermonkey/js/UbiNodeShortestPaths.h", + "external/win32/include/spidermonkey/js/UniquePtr.h", "external/win32/include/spidermonkey/js/Utility.h", "external/win32/include/spidermonkey/js/Value.h", "external/win32/include/spidermonkey/js/Vector.h", @@ -3982,13 +3986,13 @@ "external/win32/include/spidermonkey/jsperf.h", "external/win32/include/spidermonkey/jsprf.h", "external/win32/include/spidermonkey/jsprototypes.h", - "external/win32/include/spidermonkey/jsproxy.h", "external/win32/include/spidermonkey/jspubtd.h", "external/win32/include/spidermonkey/jstypes.h", "external/win32/include/spidermonkey/jsversion.h", "external/win32/include/spidermonkey/jswrapper.h", "external/win32/include/spidermonkey/mozilla/Alignment.h", "external/win32/include/spidermonkey/mozilla/AllocPolicy.h", + "external/win32/include/spidermonkey/mozilla/AlreadyAddRefed.h", "external/win32/include/spidermonkey/mozilla/Array.h", "external/win32/include/spidermonkey/mozilla/ArrayUtils.h", "external/win32/include/spidermonkey/mozilla/Assertions.h", @@ -3996,26 +4000,32 @@ "external/win32/include/spidermonkey/mozilla/Attributes.h", "external/win32/include/spidermonkey/mozilla/BinarySearch.h", "external/win32/include/spidermonkey/mozilla/BloomFilter.h", + "external/win32/include/spidermonkey/mozilla/BufferList.h", "external/win32/include/spidermonkey/mozilla/Casting.h", "external/win32/include/spidermonkey/mozilla/ChaosMode.h", "external/win32/include/spidermonkey/mozilla/Char16.h", "external/win32/include/spidermonkey/mozilla/CheckedInt.h", "external/win32/include/spidermonkey/mozilla/Compiler.h", "external/win32/include/spidermonkey/mozilla/Compression.h", - "external/win32/include/spidermonkey/mozilla/Constants.h", "external/win32/include/spidermonkey/mozilla/DebugOnly.h", "external/win32/include/spidermonkey/mozilla/Decimal.h", - "external/win32/include/spidermonkey/mozilla/Endian.h", + "external/win32/include/spidermonkey/mozilla/EndianUtils.h", "external/win32/include/spidermonkey/mozilla/EnumSet.h", + "external/win32/include/spidermonkey/mozilla/EnumTypeTraits.h", "external/win32/include/spidermonkey/mozilla/EnumeratedArray.h", + "external/win32/include/spidermonkey/mozilla/EnumeratedRange.h", + "external/win32/include/spidermonkey/mozilla/FastBernoulliTrial.h", "external/win32/include/spidermonkey/mozilla/FloatingPoint.h", + "external/win32/include/spidermonkey/mozilla/Function.h", "external/win32/include/spidermonkey/mozilla/GuardObjects.h", "external/win32/include/spidermonkey/mozilla/HashFunctions.h", + "external/win32/include/spidermonkey/mozilla/IndexSequence.h", "external/win32/include/spidermonkey/mozilla/IntegerPrintfMacros.h", + "external/win32/include/spidermonkey/mozilla/IntegerRange.h", "external/win32/include/spidermonkey/mozilla/IntegerTypeTraits.h", + "external/win32/include/spidermonkey/mozilla/JSONWriter.h", "external/win32/include/spidermonkey/mozilla/Likely.h", "external/win32/include/spidermonkey/mozilla/LinkedList.h", - "external/win32/include/spidermonkey/mozilla/MSIntTypes.h", "external/win32/include/spidermonkey/mozilla/MacroArgs.h", "external/win32/include/spidermonkey/mozilla/MacroForEach.h", "external/win32/include/spidermonkey/mozilla/MathAlgorithms.h", @@ -4024,34 +4034,285 @@ "external/win32/include/spidermonkey/mozilla/MemoryChecking.h", "external/win32/include/spidermonkey/mozilla/MemoryReporting.h", "external/win32/include/spidermonkey/mozilla/Move.h", + "external/win32/include/spidermonkey/mozilla/NotNull.h", "external/win32/include/spidermonkey/mozilla/NullPtr.h", - "external/win32/include/spidermonkey/mozilla/NumericLimits.h", + "external/win32/include/spidermonkey/mozilla/Opaque.h", + "external/win32/include/spidermonkey/mozilla/OperatorNewExtensions.h", "external/win32/include/spidermonkey/mozilla/Pair.h", "external/win32/include/spidermonkey/mozilla/PodOperations.h", "external/win32/include/spidermonkey/mozilla/Poison.h", "external/win32/include/spidermonkey/mozilla/Range.h", + "external/win32/include/spidermonkey/mozilla/RangedArray.h", "external/win32/include/spidermonkey/mozilla/RangedPtr.h", "external/win32/include/spidermonkey/mozilla/ReentrancyGuard.h", "external/win32/include/spidermonkey/mozilla/RefCountType.h", + "external/win32/include/spidermonkey/mozilla/RefCounted.h", "external/win32/include/spidermonkey/mozilla/RefPtr.h", + "external/win32/include/spidermonkey/mozilla/ReverseIterator.h", "external/win32/include/spidermonkey/mozilla/RollingMean.h", "external/win32/include/spidermonkey/mozilla/SHA1.h", + "external/win32/include/spidermonkey/mozilla/Saturate.h", + "external/win32/include/spidermonkey/mozilla/ScopeExit.h", "external/win32/include/spidermonkey/mozilla/Scoped.h", + "external/win32/include/spidermonkey/mozilla/SegmentedVector.h", + "external/win32/include/spidermonkey/mozilla/SizePrintfMacros.h", "external/win32/include/spidermonkey/mozilla/SplayTree.h", + "external/win32/include/spidermonkey/mozilla/Sprintf.h", + "external/win32/include/spidermonkey/mozilla/StackWalk.h", + "external/win32/include/spidermonkey/mozilla/StackWalk_windows.h", + "external/win32/include/spidermonkey/mozilla/StaticAnalysisFunctions.h", "external/win32/include/spidermonkey/mozilla/TaggedAnonymousMemory.h", "external/win32/include/spidermonkey/mozilla/TemplateLib.h", "external/win32/include/spidermonkey/mozilla/ThreadLocal.h", + "external/win32/include/spidermonkey/mozilla/TimeStamp.h", + "external/win32/include/spidermonkey/mozilla/TimeStamp_windows.h", "external/win32/include/spidermonkey/mozilla/ToString.h", + "external/win32/include/spidermonkey/mozilla/Tuple.h", "external/win32/include/spidermonkey/mozilla/TypeTraits.h", - "external/win32/include/spidermonkey/mozilla/TypedEnum.h", "external/win32/include/spidermonkey/mozilla/TypedEnumBits.h", - "external/win32/include/spidermonkey/mozilla/TypedEnumInternal.h", "external/win32/include/spidermonkey/mozilla/Types.h", "external/win32/include/spidermonkey/mozilla/UniquePtr.h", + "external/win32/include/spidermonkey/mozilla/UniquePtrExtensions.h", + "external/win32/include/spidermonkey/mozilla/Unused.h", + "external/win32/include/spidermonkey/mozilla/Variant.h", "external/win32/include/spidermonkey/mozilla/Vector.h", "external/win32/include/spidermonkey/mozilla/WeakPtr.h", "external/win32/include/spidermonkey/mozilla/WindowsVersion.h", + "external/win32/include/spidermonkey/mozilla/XorShift128PlusRNG.h", + "external/win32/include/spidermonkey/mozilla/double-conversion.h", + "external/win32/include/spidermonkey/mozilla/fallible.h", + "external/win32/include/spidermonkey/mozilla/mozalloc.h", + "external/win32/include/spidermonkey/mozilla/mozalloc_abort.h", + "external/win32/include/spidermonkey/mozilla/mozalloc_oom.h", + "external/win32/include/spidermonkey/mozilla/utils.h", "external/win32/include/spidermonkey/mozzconf.h", + "external/win32/include/spidermonkey/nspr/md/_darwin.cfg", + "external/win32/include/spidermonkey/nspr/md/_freebsd.cfg", + "external/win32/include/spidermonkey/nspr/md/_linux.cfg", + "external/win32/include/spidermonkey/nspr/md/_netbsd.cfg", + "external/win32/include/spidermonkey/nspr/md/_openbsd.cfg", + "external/win32/include/spidermonkey/nspr/md/_win95.cfg", + "external/win32/include/spidermonkey/nspr/nspr.h", + "external/win32/include/spidermonkey/nspr/plarena.h", + "external/win32/include/spidermonkey/nspr/plarenas.h", + "external/win32/include/spidermonkey/nspr/plbase64.h", + "external/win32/include/spidermonkey/nspr/plerror.h", + "external/win32/include/spidermonkey/nspr/plgetopt.h", + "external/win32/include/spidermonkey/nspr/plhash.h", + "external/win32/include/spidermonkey/nspr/plstr.h", + "external/win32/include/spidermonkey/nspr/pratom.h", + "external/win32/include/spidermonkey/nspr/prbit.h", + "external/win32/include/spidermonkey/nspr/prclist.h", + "external/win32/include/spidermonkey/nspr/prcmon.h", + "external/win32/include/spidermonkey/nspr/prcountr.h", + "external/win32/include/spidermonkey/nspr/prcpucfg.h", + "external/win32/include/spidermonkey/nspr/prcvar.h", + "external/win32/include/spidermonkey/nspr/prdtoa.h", + "external/win32/include/spidermonkey/nspr/prenv.h", + "external/win32/include/spidermonkey/nspr/prerr.h", + "external/win32/include/spidermonkey/nspr/prerror.h", + "external/win32/include/spidermonkey/nspr/prinet.h", + "external/win32/include/spidermonkey/nspr/prinit.h", + "external/win32/include/spidermonkey/nspr/prinrval.h", + "external/win32/include/spidermonkey/nspr/prio.h", + "external/win32/include/spidermonkey/nspr/pripcsem.h", + "external/win32/include/spidermonkey/nspr/private/pprio.h", + "external/win32/include/spidermonkey/nspr/private/pprthred.h", + "external/win32/include/spidermonkey/nspr/private/prpriv.h", + "external/win32/include/spidermonkey/nspr/prlink.h", + "external/win32/include/spidermonkey/nspr/prlock.h", + "external/win32/include/spidermonkey/nspr/prlog.h", + "external/win32/include/spidermonkey/nspr/prlong.h", + "external/win32/include/spidermonkey/nspr/prmem.h", + "external/win32/include/spidermonkey/nspr/prmon.h", + "external/win32/include/spidermonkey/nspr/prmwait.h", + "external/win32/include/spidermonkey/nspr/prnetdb.h", + "external/win32/include/spidermonkey/nspr/prolock.h", + "external/win32/include/spidermonkey/nspr/prpdce.h", + "external/win32/include/spidermonkey/nspr/prprf.h", + "external/win32/include/spidermonkey/nspr/prproces.h", + "external/win32/include/spidermonkey/nspr/prrng.h", + "external/win32/include/spidermonkey/nspr/prrwlock.h", + "external/win32/include/spidermonkey/nspr/prshm.h", + "external/win32/include/spidermonkey/nspr/prshma.h", + "external/win32/include/spidermonkey/nspr/prsystem.h", + "external/win32/include/spidermonkey/nspr/prthread.h", + "external/win32/include/spidermonkey/nspr/prtime.h", + "external/win32/include/spidermonkey/nspr/prtpool.h", + "external/win32/include/spidermonkey/nspr/prtrace.h", + "external/win32/include/spidermonkey/nspr/prtypes.h", + "external/win32/include/spidermonkey/nspr/prvrsion.h", + "external/win32/include/spidermonkey/nspr/prwin16.h", + "external/win32/include/spidermonkey/unicode/alphaindex.h", + "external/win32/include/spidermonkey/unicode/appendable.h", + "external/win32/include/spidermonkey/unicode/basictz.h", + "external/win32/include/spidermonkey/unicode/brkiter.h", + "external/win32/include/spidermonkey/unicode/bytestream.h", + "external/win32/include/spidermonkey/unicode/bytestrie.h", + "external/win32/include/spidermonkey/unicode/bytestriebuilder.h", + "external/win32/include/spidermonkey/unicode/calendar.h", + "external/win32/include/spidermonkey/unicode/caniter.h", + "external/win32/include/spidermonkey/unicode/chariter.h", + "external/win32/include/spidermonkey/unicode/choicfmt.h", + "external/win32/include/spidermonkey/unicode/coleitr.h", + "external/win32/include/spidermonkey/unicode/coll.h", + "external/win32/include/spidermonkey/unicode/compactdecimalformat.h", + "external/win32/include/spidermonkey/unicode/curramt.h", + "external/win32/include/spidermonkey/unicode/currpinf.h", + "external/win32/include/spidermonkey/unicode/currunit.h", + "external/win32/include/spidermonkey/unicode/datefmt.h", + "external/win32/include/spidermonkey/unicode/dbbi.h", + "external/win32/include/spidermonkey/unicode/dcfmtsym.h", + "external/win32/include/spidermonkey/unicode/decimfmt.h", + "external/win32/include/spidermonkey/unicode/docmain.h", + "external/win32/include/spidermonkey/unicode/dtfmtsym.h", + "external/win32/include/spidermonkey/unicode/dtintrv.h", + "external/win32/include/spidermonkey/unicode/dtitvfmt.h", + "external/win32/include/spidermonkey/unicode/dtitvinf.h", + "external/win32/include/spidermonkey/unicode/dtptngen.h", + "external/win32/include/spidermonkey/unicode/dtrule.h", + "external/win32/include/spidermonkey/unicode/enumset.h", + "external/win32/include/spidermonkey/unicode/errorcode.h", + "external/win32/include/spidermonkey/unicode/fieldpos.h", + "external/win32/include/spidermonkey/unicode/filteredbrk.h", + "external/win32/include/spidermonkey/unicode/fmtable.h", + "external/win32/include/spidermonkey/unicode/format.h", + "external/win32/include/spidermonkey/unicode/fpositer.h", + "external/win32/include/spidermonkey/unicode/gender.h", + "external/win32/include/spidermonkey/unicode/gregocal.h", + "external/win32/include/spidermonkey/unicode/icudataver.h", + "external/win32/include/spidermonkey/unicode/icuplug.h", + "external/win32/include/spidermonkey/unicode/idna.h", + "external/win32/include/spidermonkey/unicode/listformatter.h", + "external/win32/include/spidermonkey/unicode/localpointer.h", + "external/win32/include/spidermonkey/unicode/locdspnm.h", + "external/win32/include/spidermonkey/unicode/locid.h", + "external/win32/include/spidermonkey/unicode/measfmt.h", + "external/win32/include/spidermonkey/unicode/measunit.h", + "external/win32/include/spidermonkey/unicode/measure.h", + "external/win32/include/spidermonkey/unicode/messagepattern.h", + "external/win32/include/spidermonkey/unicode/msgfmt.h", + "external/win32/include/spidermonkey/unicode/normalizer2.h", + "external/win32/include/spidermonkey/unicode/normlzr.h", + "external/win32/include/spidermonkey/unicode/numfmt.h", + "external/win32/include/spidermonkey/unicode/numsys.h", + "external/win32/include/spidermonkey/unicode/parseerr.h", + "external/win32/include/spidermonkey/unicode/parsepos.h", + "external/win32/include/spidermonkey/unicode/platform.h", + "external/win32/include/spidermonkey/unicode/plurfmt.h", + "external/win32/include/spidermonkey/unicode/plurrule.h", + "external/win32/include/spidermonkey/unicode/ptypes.h", + "external/win32/include/spidermonkey/unicode/putil.h", + "external/win32/include/spidermonkey/unicode/rbbi.h", + "external/win32/include/spidermonkey/unicode/rbnf.h", + "external/win32/include/spidermonkey/unicode/rbtz.h", + "external/win32/include/spidermonkey/unicode/regex.h", + "external/win32/include/spidermonkey/unicode/region.h", + "external/win32/include/spidermonkey/unicode/reldatefmt.h", + "external/win32/include/spidermonkey/unicode/rep.h", + "external/win32/include/spidermonkey/unicode/resbund.h", + "external/win32/include/spidermonkey/unicode/schriter.h", + "external/win32/include/spidermonkey/unicode/scientificnumberformatter.h", + "external/win32/include/spidermonkey/unicode/search.h", + "external/win32/include/spidermonkey/unicode/selfmt.h", + "external/win32/include/spidermonkey/unicode/simpleformatter.h", + "external/win32/include/spidermonkey/unicode/simpletz.h", + "external/win32/include/spidermonkey/unicode/smpdtfmt.h", + "external/win32/include/spidermonkey/unicode/sortkey.h", + "external/win32/include/spidermonkey/unicode/std_string.h", + "external/win32/include/spidermonkey/unicode/strenum.h", + "external/win32/include/spidermonkey/unicode/stringpiece.h", + "external/win32/include/spidermonkey/unicode/stringtriebuilder.h", + "external/win32/include/spidermonkey/unicode/stsearch.h", + "external/win32/include/spidermonkey/unicode/symtable.h", + "external/win32/include/spidermonkey/unicode/tblcoll.h", + "external/win32/include/spidermonkey/unicode/timezone.h", + "external/win32/include/spidermonkey/unicode/tmunit.h", + "external/win32/include/spidermonkey/unicode/tmutamt.h", + "external/win32/include/spidermonkey/unicode/tmutfmt.h", + "external/win32/include/spidermonkey/unicode/translit.h", + "external/win32/include/spidermonkey/unicode/tzfmt.h", + "external/win32/include/spidermonkey/unicode/tznames.h", + "external/win32/include/spidermonkey/unicode/tzrule.h", + "external/win32/include/spidermonkey/unicode/tztrans.h", + "external/win32/include/spidermonkey/unicode/ubidi.h", + "external/win32/include/spidermonkey/unicode/ubiditransform.h", + "external/win32/include/spidermonkey/unicode/ubrk.h", + "external/win32/include/spidermonkey/unicode/ucal.h", + "external/win32/include/spidermonkey/unicode/ucasemap.h", + "external/win32/include/spidermonkey/unicode/ucat.h", + "external/win32/include/spidermonkey/unicode/uchar.h", + "external/win32/include/spidermonkey/unicode/ucharstrie.h", + "external/win32/include/spidermonkey/unicode/ucharstriebuilder.h", + "external/win32/include/spidermonkey/unicode/uchriter.h", + "external/win32/include/spidermonkey/unicode/uclean.h", + "external/win32/include/spidermonkey/unicode/ucnv.h", + "external/win32/include/spidermonkey/unicode/ucnv_cb.h", + "external/win32/include/spidermonkey/unicode/ucnv_err.h", + "external/win32/include/spidermonkey/unicode/ucnvsel.h", + "external/win32/include/spidermonkey/unicode/ucol.h", + "external/win32/include/spidermonkey/unicode/ucoleitr.h", + "external/win32/include/spidermonkey/unicode/uconfig.h", + "external/win32/include/spidermonkey/unicode/ucsdet.h", + "external/win32/include/spidermonkey/unicode/ucurr.h", + "external/win32/include/spidermonkey/unicode/udat.h", + "external/win32/include/spidermonkey/unicode/udata.h", + "external/win32/include/spidermonkey/unicode/udateintervalformat.h", + "external/win32/include/spidermonkey/unicode/udatpg.h", + "external/win32/include/spidermonkey/unicode/udisplaycontext.h", + "external/win32/include/spidermonkey/unicode/uenum.h", + "external/win32/include/spidermonkey/unicode/ufieldpositer.h", + "external/win32/include/spidermonkey/unicode/uformattable.h", + "external/win32/include/spidermonkey/unicode/ugender.h", + "external/win32/include/spidermonkey/unicode/uidna.h", + "external/win32/include/spidermonkey/unicode/uiter.h", + "external/win32/include/spidermonkey/unicode/uldnames.h", + "external/win32/include/spidermonkey/unicode/ulistformatter.h", + "external/win32/include/spidermonkey/unicode/uloc.h", + "external/win32/include/spidermonkey/unicode/ulocdata.h", + "external/win32/include/spidermonkey/unicode/umachine.h", + "external/win32/include/spidermonkey/unicode/umisc.h", + "external/win32/include/spidermonkey/unicode/umsg.h", + "external/win32/include/spidermonkey/unicode/unifilt.h", + "external/win32/include/spidermonkey/unicode/unifunct.h", + "external/win32/include/spidermonkey/unicode/unimatch.h", + "external/win32/include/spidermonkey/unicode/unirepl.h", + "external/win32/include/spidermonkey/unicode/uniset.h", + "external/win32/include/spidermonkey/unicode/unistr.h", + "external/win32/include/spidermonkey/unicode/unorm.h", + "external/win32/include/spidermonkey/unicode/unorm2.h", + "external/win32/include/spidermonkey/unicode/unum.h", + "external/win32/include/spidermonkey/unicode/unumsys.h", + "external/win32/include/spidermonkey/unicode/uobject.h", + "external/win32/include/spidermonkey/unicode/upluralrules.h", + "external/win32/include/spidermonkey/unicode/uregex.h", + "external/win32/include/spidermonkey/unicode/uregion.h", + "external/win32/include/spidermonkey/unicode/ureldatefmt.h", + "external/win32/include/spidermonkey/unicode/urename.h", + "external/win32/include/spidermonkey/unicode/urep.h", + "external/win32/include/spidermonkey/unicode/ures.h", + "external/win32/include/spidermonkey/unicode/uscript.h", + "external/win32/include/spidermonkey/unicode/usearch.h", + "external/win32/include/spidermonkey/unicode/uset.h", + "external/win32/include/spidermonkey/unicode/usetiter.h", + "external/win32/include/spidermonkey/unicode/ushape.h", + "external/win32/include/spidermonkey/unicode/uspoof.h", + "external/win32/include/spidermonkey/unicode/usprep.h", + "external/win32/include/spidermonkey/unicode/ustring.h", + "external/win32/include/spidermonkey/unicode/ustringtrie.h", + "external/win32/include/spidermonkey/unicode/utext.h", + "external/win32/include/spidermonkey/unicode/utf.h", + "external/win32/include/spidermonkey/unicode/utf16.h", + "external/win32/include/spidermonkey/unicode/utf32.h", + "external/win32/include/spidermonkey/unicode/utf8.h", + "external/win32/include/spidermonkey/unicode/utf_old.h", + "external/win32/include/spidermonkey/unicode/utmscale.h", + "external/win32/include/spidermonkey/unicode/utrace.h", + "external/win32/include/spidermonkey/unicode/utrans.h", + "external/win32/include/spidermonkey/unicode/utypes.h", + "external/win32/include/spidermonkey/unicode/uvernum.h", + "external/win32/include/spidermonkey/unicode/uversion.h", + "external/win32/include/spidermonkey/unicode/vtzone.h", "external/win32/include/spidermonkey/zconf.h", "external/win32/include/spidermonkey/zlib.h", "external/win32/include/sqlite3/sqlite3.h", @@ -4068,18 +4329,15 @@ "external/win32/include/webp/types.h", "external/win32/include/websockets/libwebsockets.h", "external/win32/include/websockets/lws_config.h", - "external/win32/include/websockets/win32helpers/getopt.h", - "external/win32/include/websockets/win32helpers/gettimeofday.h", - "external/win32/include/websockets/win32helpers/websock-w32.h", "external/win32/include/zlib/zconf.h", "external/win32/include/zlib/zlib.h", "external/win32/libs/Debug/", "external/win32/libs/Debug/libchipmunk-2015.lib", "external/win32/libs/Debug/libchipmunk.lib", - "external/win32/libs/Debug/mozjs-52.lib", + "external/win32/libs/Debug/mozglue.lib", "external/win32/libs/Debug/mozjs-52.dll", - "external/win32/libs/Debug/mozglue.lib", - "external/win32/libs/Debug/nspr4.dll", + "external/win32/libs/Debug/mozjs-52.lib", + "external/win32/libs/Debug/nspr4.dll", "external/win32/libs/OpenAL32.dll", "external/win32/libs/OpenAL32.lib", "external/win32/libs/freetype.lib", @@ -4094,8 +4352,6 @@ "external/win32/libs/libcrypto.lib", "external/win32/libs/libcurl.dll", "external/win32/libs/libcurl.lib", - "external/win32/libs/libcurl_imp.lib", - "external/win32/libs/libeay32.lib", "external/win32/libs/libiconv.lib", "external/win32/libs/libjpeg-2015.lib", "external/win32/libs/libjpeg.lib", @@ -4116,13 +4372,12 @@ "external/win32/libs/libvorbisfile.lib", "external/win32/libs/libwebp.lib", "external/win32/libs/libzlib.lib", - "external/win32/libs/mozjs-52.lib", + "external/win32/libs/mozglue.lib", "external/win32/libs/mozjs-52.dll", - "external/win32/libs/mozglue.lib", - "external/win32/libs/nspr4.dll", + "external/win32/libs/mozjs-52.lib", + "external/win32/libs/nspr4.dll", "external/win32/libs/sqlite3.dll", "external/win32/libs/sqlite3.lib", - "external/win32/libs/ssleay32.lib", "external/win32/libs/websockets.dll", "external/win32/libs/websockets.lib", "external/win32/libs/zlib1.dll", @@ -4235,7 +4490,6 @@ "tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/zh-Hans.lproj/ConsoleWindow.strings", "tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/zh-Hans.lproj/MainMenu.xib", "tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj", - "tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.xcworkspace/xcshareddata/simulator.xcscmblueprint", "tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.cpp", "tools/simulator/frameworks/runtime-src/proj.win32/SimulatorWin.h", "tools/simulator/frameworks/runtime-src/proj.win32/build-cfg.json", @@ -4482,9 +4736,7 @@ "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/proj.android/Android.mk", - "cocos/scripting/js-bindings/proj.android/prebuilt-mk/Android.mk", "cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj", - "cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.xcworkspace/xcshareddata/cocos2d_js_bindings.xcscmblueprint", "cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj", "cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters", "cocos/scripting/js-bindings/script/ccui/jsb_ccui_create_apis.js", @@ -4592,7 +4844,6 @@ "tools/tojs/cocos2dx_studio.ini", "tools/tojs/cocos2dx_ui.ini", "tools/tojs/creator.ini", - "tools/tojs/genbindings.py", - "tools/tojs/userconf.ini" + "tools/tojs/genbindings.py" ] } \ No newline at end of file