Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-cef7f2eb0a7ce536df264b4b3fa72470af8213d0
+7658fe75258895d82e9432317ff63b182547bcdc

build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -0,0 +1 @@
+f0ce606901bf2ba3acceae9e9562214dde6a4c69

build/samples.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +0,0 @@
-f3d0c334145f571e5338f3e0fa051f7713668e3f

cocos/2d/Android.mk

@@ -7,176 +7,178 @@ LOCAL_MODULE := cocos2dx_static
 LOCAL_MODULE_FILENAME := libcocos2d
 
 LOCAL_SRC_FILES := \
+base64.cpp \
+CCAction.cpp \
+CCActionCamera.cpp \
+CCActionCatmullRom.cpp \
+CCActionEase.cpp \
+CCActionGrid.cpp \
+CCActionGrid3D.cpp \
+CCActionInstant.cpp \
+CCActionInterval.cpp \
+CCActionManager.cpp \
+CCActionPageTurn3D.cpp \
+CCActionProgressTimer.cpp \
+CCActionTiledGrid.cpp \
+CCActionTween.cpp \
+CCAnimation.cpp \
+CCAnimationCache.cpp \
+CCAtlasNode.cpp \
 CCCamera.cpp \
+ccCArray.cpp \
+CCClippingNode.cpp \
+CCComponent.cpp \
+CCComponentContainer.cpp \
 CCConfiguration.cpp \
 CCDeprecated.cpp \
 CCDirector.cpp \
+CCDrawingPrimitives.cpp \
+CCDrawNode.cpp \
+CCEvent.cpp \
+CCEventAcceleration.cpp \
+CCEventCustom.cpp \
+CCEventDispatcher.cpp \
+CCEventKeyboard.cpp \
+CCEventListener.cpp \
+CCEventListenerAcceleration.cpp \
+CCEventListenerCustom.cpp \
+CCEventListenerKeyboard.cpp \
+CCEventListenerTouch.cpp \
+CCEventTouch.cpp \
+CCFont.cpp \
+CCFontAtlas.cpp \
+CCFontAtlasCache.cpp \
+CCFontAtlasFactory.cpp \
+CCFontDefinition.cpp \
+CCFontFNT.cpp \
+CCFontFreeType.cpp \
 ccFPSImages.c \
+CCGLBufferedNode.cpp \
+CCGLProgram.cpp \
+ccGLStateCache.cpp \
+CCGrabber.cpp \
+CCGrid.cpp \
+CCIMEDispatcher.cpp \
+CCLabel.cpp \
+CCLabelAtlas.cpp \
+CCLabelBMFont.cpp \
+CCLabelTextFormatter.cpp \
+CCLabelTTF.cpp \
+CCLayer.cpp \
+CCMenu.cpp \
+CCMenuItem.cpp \
+CCMotionStreak.cpp \
+CCNode.cpp \
+CCNotificationCenter.cpp \
+CCParallaxNode.cpp \
+CCParticleBatchNode.cpp \
+CCParticleExamples.cpp \
+CCParticleSystem.cpp \
+CCParticleSystemQuad.cpp \
+CCProfiling.cpp \
+CCProgressTimer.cpp \
+CCRenderTexture.cpp \
+CCScene.cpp \
 CCScheduler.cpp \
+CCScriptSupport.cpp \
+CCShaderCache.cpp \
+ccShaders.cpp \
+CCSprite.cpp \
+CCSpriteBatchNode.cpp \
+CCSpriteFrame.cpp \
+CCSpriteFrameCache.cpp \
+CCTextFieldTTF.cpp \
+CCTextImage.cpp \
+CCTexture2D.cpp \
+CCTextureAtlas.cpp \
+CCTextureCache.cpp \
+CCTileMapAtlas.cpp \
+CCTMXLayer.cpp \
+CCTMXObjectGroup.cpp \
+CCTMXTiledMap.cpp \
+CCTMXXMLParser.cpp \
+CCTouch.cpp \
+CCTransition.cpp \
+CCTransitionPageTurn.cpp \
+CCTransitionProgress.cpp \
 ccTypes.cpp \
+CCUserDefault.cpp \
+CCUserDefaultAndroid.cpp \
+ccUTF8.cpp \
+ccUtils.cpp \
+CCVertex.cpp \
 cocos2d.cpp \
-actions/CCAction.cpp \
+TGAlib.cpp \
-actions/CCActionCamera.cpp \
+TransformUtils.cpp \
-actions/CCActionCatmullRom.cpp \
+ZipUtils.cpp \
-actions/CCActionEase.cpp \
-actions/CCActionGrid.cpp \
-actions/CCActionGrid3D.cpp \
-actions/CCActionInstant.cpp \
-actions/CCActionInterval.cpp \
-actions/CCActionManager.cpp \
-actions/CCActionPageTurn3D.cpp \
-actions/CCActionProgressTimer.cpp \
-actions/CCActionTiledGrid.cpp \
-actions/CCActionTween.cpp \
-base_nodes/CCAtlasNode.cpp \
-base_nodes/CCNode.cpp \
-cocoa/CCAffineTransform.cpp \
-cocoa/CCArray.cpp \
-cocoa/CCAutoreleasePool.cpp \
-cocoa/CCData.cpp \
-cocoa/CCDataVisitor.cpp \
-cocoa/CCDictionary.cpp \
-cocoa/CCGeometry.cpp \
-cocoa/CCNS.cpp \
-cocoa/CCObject.cpp \
-cocoa/CCSet.cpp \
-cocoa/CCString.cpp \
-draw_nodes/CCDrawingPrimitives.cpp \
-draw_nodes/CCDrawNode.cpp \
-effects/CCGrabber.cpp \
-effects/CCGrid.cpp \
-event_dispatcher/CCEventAcceleration.cpp \
-event_dispatcher/CCEventListenerAcceleration.cpp \
-event_dispatcher/CCEventCustom.cpp \
-event_dispatcher/CCEventListenerCustom.cpp \
-event_dispatcher/CCEvent.cpp \
-event_dispatcher/CCEventDispatcher.cpp \
-event_dispatcher/CCEventListener.cpp \
-event_dispatcher/CCEventKeyboard.cpp \
-event_dispatcher/CCEventListenerKeyboard.cpp \
-event_dispatcher/CCTouch.cpp \
-event_dispatcher/CCEventTouch.cpp \
-event_dispatcher/CCEventListenerTouch.cpp \
-kazmath/src/aabb.c \
-kazmath/src/mat3.c \
-kazmath/src/mat4.c \
-kazmath/src/neon_matrix_impl.c \
-kazmath/src/plane.c \
-kazmath/src/quaternion.c \
-kazmath/src/ray2.c \
-kazmath/src/utility.c \
-kazmath/src/vec2.c \
-kazmath/src/vec3.c \
-kazmath/src/vec4.c \
-kazmath/src/GL/mat4stack.c \
-kazmath/src/GL/matrix.c \
-label_nodes/CCFont.cpp \
-label_nodes/CCFontAtlas.cpp \
-label_nodes/CCFontAtlasCache.cpp \
-label_nodes/CCFontAtlasFactory.cpp \
-label_nodes/CCFontDefinition.cpp \
-label_nodes/CCFontFNT.cpp \
-label_nodes/CCFontFreeType.cpp \
-label_nodes/CCLabel.cpp \
-label_nodes/CCLabelAtlas.cpp \
-label_nodes/CCLabelBMFont.cpp \
-label_nodes/CCLabelTextFormatter.cpp \
-label_nodes/CCLabelTTF.cpp \
-label_nodes/CCTextImage.cpp \
-layers_scenes_transitions_nodes/CCLayer.cpp \
-layers_scenes_transitions_nodes/CCScene.cpp \
-layers_scenes_transitions_nodes/CCTransition.cpp \
-layers_scenes_transitions_nodes/CCTransitionPageTurn.cpp \
-layers_scenes_transitions_nodes/CCTransitionProgress.cpp \
-menu_nodes/CCMenu.cpp \
-menu_nodes/CCMenuItem.cpp \
-misc_nodes/CCClippingNode.cpp \
-misc_nodes/CCMotionStreak.cpp \
-misc_nodes/CCProgressTimer.cpp \
-misc_nodes/CCRenderTexture.cpp \
-particle_nodes/CCParticleBatchNode.cpp \
-particle_nodes/CCParticleExamples.cpp \
-particle_nodes/CCParticleSystem.cpp \
-particle_nodes/CCParticleSystemQuad.cpp \
-physics/CCPhysicsBody.cpp \
-physics/CCPhysicsContact.cpp \
-physics/CCPhysicsJoint.cpp \
-physics/CCPhysicsShape.cpp \
-physics/CCPhysicsWorld.cpp \
-physics/Box2D/CCPhysicsBodyInfo.cpp \
-physics/Box2D/CCPhysicsContactInfo.cpp \
-physics/Box2D/CCPhysicsJointInfo.cpp \
-physics/Box2D/CCPhysicsShapeInfo.cpp \
-physics/Box2D/CCPhysicsWorldInfo.cpp \
-physics/chipmunk/CCPhysicsBodyInfo.cpp \
-physics/chipmunk/CCPhysicsContactInfo.cpp \
-physics/chipmunk/CCPhysicsJointInfo.cpp \
-physics/chipmunk/CCPhysicsShapeInfo.cpp \
-physics/chipmunk/CCPhysicsWorldInfo.cpp \
 platform/CCEGLViewProtocol.cpp \
 platform/CCFileUtils.cpp \
 platform/CCSAXParser.cpp \
 platform/CCThread.cpp \
-platform/third_party/common/atitc/atitc.cpp \
+../base/atitc.cpp \
-platform/third_party/common/etc/etc1.cpp \
+../base/CCAffineTransform.cpp \
-platform/third_party/common/s3tc/s3tc.cpp \
+../base/CCArray.cpp \
-script_support/CCScriptSupport.cpp \
+../base/CCAutoreleasePool.cpp \
-shaders/CCGLProgram.cpp \
+../base/CCData.cpp \
-shaders/ccGLStateCache.cpp \
+../base/CCDataVisitor.cpp \
-shaders/CCShaderCache.cpp \
+../base/CCDictionary.cpp \
-shaders/ccShaders.cpp \
+../base/CCGeometry.cpp \
-sprite_nodes/CCAnimation.cpp \
+../base/CCNS.cpp \
-sprite_nodes/CCAnimationCache.cpp \
+../base/CCObject.cpp \
-sprite_nodes/CCSprite.cpp \
+../base/CCSet.cpp \
-sprite_nodes/CCSpriteBatchNode.cpp \
+../base/CCString.cpp \
-sprite_nodes/CCSpriteFrame.cpp \
+../base/etc1.cpp \
-sprite_nodes/CCSpriteFrameCache.cpp \
+../base/s3tc.cpp \
-support/base64.cpp \
+../math/kazmath/src/aabb.c \
-support/CCNotificationCenter.cpp \
+../math/kazmath/src/mat3.c \
-support/CCProfiling.cpp \
+../math/kazmath/src/mat4.c \
-support/ccUTF8.cpp \
+../math/kazmath/src/neon_matrix_impl.c \
-support/ccUtils.cpp \
+../math/kazmath/src/plane.c \
-support/CCVertex.cpp \
+../math/kazmath/src/quaternion.c \
-support/TransformUtils.cpp \
+../math/kazmath/src/ray2.c \
-support/component/CCComponent.cpp \
+../math/kazmath/src/utility.c \
-support/component/CCComponentContainer.cpp \
+../math/kazmath/src/vec2.c \
-support/data_support/ccCArray.cpp \
+../math/kazmath/src/vec3.c \
-support/image_support/TGAlib.cpp \
+../math/kazmath/src/vec4.c \
-support/tinyxml2/tinyxml2.cpp \
+../math/kazmath/src/GL/mat4stack.c \
-support/user_default/CCUserDefaultAndroid.cpp \
+../math/kazmath/src/GL/matrix.c \
-support/zip_support/ioapi.cpp \
+../physics/CCPhysicsBody.cpp \
-support/zip_support/unzip.cpp \
+../physics/CCPhysicsContact.cpp \
-support/zip_support/ZipUtils.cpp \
+../physics/CCPhysicsJoint.cpp \
-text_input_node/CCIMEDispatcher.cpp \
+../physics/CCPhysicsShape.cpp \
-text_input_node/CCTextFieldTTF.cpp \
+../physics/CCPhysicsWorld.cpp \
-textures/CCTexture2D.cpp \
+../physics/box2d/CCPhysicsBodyInfo.cpp \
-textures/CCTextureAtlas.cpp \
+../physics/box2d/CCPhysicsContactInfo.cpp \
-textures/CCTextureCache.cpp \
+../physics/box2d/CCPhysicsJointInfo.cpp \
-tilemap_parallax_nodes/CCParallaxNode.cpp \
+../physics/box2d/CCPhysicsShapeInfo.cpp \
-tilemap_parallax_nodes/CCTileMapAtlas.cpp \
+../physics/box2d/CCPhysicsWorldInfo.cpp \
-tilemap_parallax_nodes/CCTMXLayer.cpp \
+../physics/chipmunk/CCPhysicsBodyInfo.cpp \
-tilemap_parallax_nodes/CCTMXObjectGroup.cpp \
+../physics/chipmunk/CCPhysicsContactInfo.cpp \
-tilemap_parallax_nodes/CCTMXTiledMap.cpp \
+../physics/chipmunk/CCPhysicsJointInfo.cpp \
-tilemap_parallax_nodes/CCTMXXMLParser.cpp
+../physics/chipmunk/CCPhysicsShapeInfo.cpp \
+../physics/chipmunk/CCPhysicsWorldInfo.cpp \
+../../external/tinyxml2/tinyxml2.cpp \
+../../external/unzip/ioapi.cpp \
+../../external/unzip/unzip.cpp
 
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
-                    $(LOCAL_PATH)/include \
+                    $(LOCAL_PATH)/../math/kazmath/include \
-                    $(LOCAL_PATH)/kazmath/include \
+                    platform/android \
-                    $(LOCAL_PATH)/platform/android \
+                    $(LOCAL_PATH)/../physics \
-                    $(LOCAL_PATH)/platform/third_party/common/etc \
+                    $(LOCAL_PATH)/../base \
-                    $(LOCAL_PATH)/platform/third_party/common/s3tc \
+                    $(LOCAL_PATH)/../../external/tinyxml2 \
-                    $(LOCAL_PATH)/platform/third_party/common/atitc \
+                    $(LOCAL_PATH)/../../external/unzip \
-                    $(LOCAL_PATH)/../external/chipmunk/include/chipmunk
+                    $(LOCAL_PATH)/../../external/chipmunk/include/chipmunk
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
-                    $(LOCAL_PATH)/include \
+                    $(LOCAL_PATH)/../math/kazmath/include \
-                    $(LOCAL_PATH)/kazmath/include \
                     $(LOCAL_PATH)/platform/android \
-                    $(LOCAL_PATH)/platform/third_party/common/etc \
+                    $(LOCAL_PATH)/../physics \
-                    $(LOCAL_PATH)/platform/third_party/common/s3tc \
+                    $(LOCAL_PATH)/../base \
-                    $(LOCAL_PATH)/platform/third_party/common/atitc \
+                    $(LOCAL_PATH)/../../external/tinyxml2 \
-                    $(LOCAL_PATH)/../external/chipmunk/include/chipmunk
+                    $(LOCAL_PATH)/../../external/unzip \
+                    $(LOCAL_PATH)/../../external/chipmunk/include/chipmunk
 
 
 LOCAL_LDLIBS := -lGLESv2 \
@@ -196,6 +198,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libtiff_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libwebp_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_freetype2_static
 LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 
 # define the macro to compile through support/zip_support/ioapi.c
 LOCAL_CFLAGS   := -Wno-psabi -DUSE_FILE32API
@@ -203,9 +206,10 @@ LOCAL_EXPORT_CFLAGS   := -Wno-psabi -DUSE_FILE32API
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,libjpeg)
+$(call import-module,jpeg/prebuilt/android)
-$(call import-module,libpng)
+$(call import-module,png/prebuilt/android)
-$(call import-module,libtiff)
+$(call import-module,tiff/prebuilt/android)
-$(call import-module,libwebp)
+$(call import-module,webp/prebuilt/android)
-$(call import-module,libfreetype2)
+$(call import-module,freetype2/prebuilt/android)
-$(call import-module,external/chipmunk)
+$(call import-module,chipmunk)
+$(call import-module,2d/platform/android)

cocos/2d/CCAction.cpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 #include "CCAction.h"
 #include "CCActionInterval.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCDirector.h"
 
 NS_CC_BEGIN

cocos/2d/CCAction.h

@@ -27,9 +27,9 @@ THE SOFTWARE.
 #ifndef __ACTIONS_CCACTION_H__
 #define __ACTIONS_CCACTION_H__
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
-#include "cocoa/CCGeometry.h"
+#include "CCGeometry.h"
-#include "platform/CCPlatformMacros.h"
+#include "CCPlatformMacros.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionCamera.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCActionCamera.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCCamera.h"
 #include "CCStdC.h"
 

cocos/2d/CCActionCatmullRom.h

@@ -40,8 +40,8 @@
 #include <vector>
 
 #include "CCActionInterval.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
-#include "cocoa/CCGeometry.h"
+#include "CCGeometry.h"
 
 NS_CC_BEGIN;
 

cocos/2d/CCActionGrid.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "CCActionGrid.h"
 #include "CCDirector.h"
-#include "effects/CCGrid.h"
+#include "CCGrid.h"
 
 NS_CC_BEGIN
 // implementation of GridAction

cocos/2d/CCActionInstant.cpp

@@ -25,9 +25,9 @@
  ****************************************************************************/
 
 #include "CCActionInstant.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
-#include "sprite_nodes/CCSprite.h"
+#include "CCSprite.h"
-#include "script_support/CCScriptSupport.h"
+#include "CCScriptSupport.h"
 
 #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

cocos/2d/CCActionInterval.cpp

@@ -25,8 +25,8 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCActionInterval.h"
-#include "sprite_nodes/CCSprite.h"
+#include "CCSprite.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCStdC.h"
 #include "CCActionInstant.h"
 #include <stdarg.h>

cocos/2d/CCActionInterval.h

@@ -27,11 +27,11 @@ THE SOFTWARE.
 #ifndef __ACTION_CCINTERVAL_ACTION_H__
 #define __ACTION_CCINTERVAL_ACTION_H__
 
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCAction.h"
 #include "CCProtocols.h"
-#include "sprite_nodes/CCSpriteFrame.h"
+#include "CCSpriteFrame.h"
-#include "sprite_nodes/CCAnimation.h"
+#include "CCAnimation.h"
 #include <vector>
 
 NS_CC_BEGIN

cocos/2d/CCActionManager.cpp

@@ -26,12 +26,12 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCActionManager.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCScheduler.h"
 #include "ccMacros.h"
-#include "support/data_support/ccCArray.h"
+#include "ccCArray.h"
-#include "support/data_support/uthash.h"
+#include "uthash.h"
-#include "cocoa/CCSet.h"
+#include "CCSet.h"
 
 NS_CC_BEGIN
 //

cocos/2d/CCActionManager.h

@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define __ACTION_CCACTION_MANAGER_H__
 
 #include "CCAction.h"
-#include "cocoa/CCArray.h"
+#include "CCArray.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionProgressTimer.cpp

@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "CCActionProgressTimer.h"
-#include "misc_nodes/CCProgressTimer.h"
+#include "CCProgressTimer.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCActionTiledGrid.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "CCActionTiledGrid.h"
 #include "CCDirector.h"
 #include "ccMacros.h"
-#include "effects/CCGrid.h"
+#include "CCGrid.h"
 #include <stdlib.h>
 
 NS_CC_BEGIN

cocos/2d/CCAnimation.cpp

@@ -24,10 +24,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "CCAnimation.h"
-#include "textures/CCTextureCache.h"
+#include "CCTextureCache.h"
-#include "textures/CCTexture2D.h"
+#include "CCTexture2D.h"
 #include "ccMacros.h"
-#include "sprite_nodes/CCSpriteFrame.h"
+#include "CCSpriteFrame.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCAnimation.h

@@ -26,11 +26,11 @@ THE SOFTWARE.
 #ifndef __CC_ANIMATION_H__
 #define __CC_ANIMATION_H__
 
-#include "platform/CCPlatformConfig.h"
+#include "CCPlatformConfig.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
-#include "cocoa/CCArray.h"
+#include "CCArray.h"
-#include "cocoa/CCDictionary.h"
+#include "CCDictionary.h"
-#include "cocoa/CCGeometry.h"
+#include "CCGeometry.h"
 #include "CCSpriteFrame.h"
 #include <string>
 

cocos/2d/CCAnimationCache.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "CCAnimation.h"
 #include "CCSpriteFrame.h"
 #include "CCSpriteFrameCache.h"
-#include "cocoa/CCString.h"
+#include "CCString.h"
 #include "platform/CCFileUtils.h"
 
 using namespace std;

cocos/2d/CCAnimationCache.h

@@ -26,8 +26,8 @@ THE SOFTWARE.
 #ifndef __CC_ANIMATION_CACHE_H__
 #define __CC_ANIMATION_CACHE_H__
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
-#include "cocoa/CCDictionary.h"
+#include "CCDictionary.h"
 
 #include <string>
 

cocos/2d/CCAtlasNode.cpp

@@ -25,14 +25,14 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCAtlasNode.h"
-#include "textures/CCTextureAtlas.h"
+#include "CCTextureAtlas.h"
-#include "textures/CCTextureCache.h"
+#include "CCTextureCache.h"
 #include "CCDirector.h"
-#include "shaders/CCGLProgram.h"
+#include "CCGLProgram.h"
-#include "shaders/CCShaderCache.h"
+#include "CCShaderCache.h"
-#include "shaders/ccGLStateCache.h"
+#include "ccGLStateCache.h"
 #include "CCDirector.h"
-#include "support/TransformUtils.h"
+#include "TransformUtils.h"
 
 // external
 #include "kazmath/GL/matrix.h"

cocos/2d/CCCamera.cpp

@@ -24,10 +24,10 @@ THE SOFTWARE.
 ****************************************************************************/
 
 #include "CCCamera.h"
-#include "cocoa/CCString.h"
+#include "CCString.h"
 #include "CCGL.h"
 
-#include "draw_nodes/CCDrawingPrimitives.h"
+#include "CCDrawingPrimitives.h"
 #include "CCDirector.h"
 #include "kazmath/GL/matrix.h"
 

cocos/2d/CCCamera.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 
 #include <string>
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 #include "ccMacros.h"
 #include "kazmath/mat4.h"
 

cocos/2d/CCClippingNode.cpp

@@ -27,10 +27,10 @@
 
 #include "CCClippingNode.h"
 #include "kazmath/GL/matrix.h"
-#include "shaders/CCGLProgram.h"
+#include "CCGLProgram.h"
-#include "shaders/CCShaderCache.h"
+#include "CCShaderCache.h"
 #include "CCDirector.h"
-#include "draw_nodes/CCDrawingPrimitives.h"
+#include "CCDrawingPrimitives.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCClippingNode.h

@@ -28,7 +28,7 @@
 #ifndef __MISCNODE_CCCLIPPING_NODE_H__
 #define __MISCNODE_CCCLIPPING_NODE_H__
 
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCGL.h"
 
 NS_CC_BEGIN

cocos/2d/CCComponent.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "support/component/CCComponent.h"
+#include "CCComponent.h"
 
 
 NS_CC_BEGIN

cocos/2d/CCComponent.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __CC_FRAMEWORK_COMPONENT_H__
 #define __CC_FRAMEWORK_COMPONENT_H__
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 #include <string>
 
 NS_CC_BEGIN

cocos/2d/CCComponentContainer.cpp

@@ -23,8 +23,8 @@ THE SOFTWARE.
 ****************************************************************************/
 
 
-#include "support/component/CCComponentContainer.h"
+#include "CCComponentContainer.h"
-#include "support/component/CCComponent.h"
+#include "CCComponent.h"
 #include "CCDirector.h"
 
 NS_CC_BEGIN

cocos/2d/CCComponentContainer.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __CC_FRAMEWORK_COMCONTAINER_H__
 #define __CC_FRAMEWORK_COMCONTAINER_H__
 
-#include "cocoa/CCDictionary.h"
+#include "CCDictionary.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCConfiguration.cpp

@@ -27,9 +27,9 @@ THE SOFTWARE.
 #include <string.h>
 #include "ccMacros.h"
 #include "ccConfig.h"
-#include "cocoa/CCDictionary.h"
+#include "CCDictionary.h"
-#include "cocoa/CCInteger.h"
+#include "CCInteger.h"
-#include "cocoa/CCBool.h"
+#include "CCBool.h"
 #include "cocos2d.h"
 #include "platform/CCFileUtils.h"
 

cocos/2d/CCConfiguration.h

@@ -26,9 +26,9 @@ THE SOFTWARE.
 #ifndef __CCCONFIGURATION_H__
 #define __CCCONFIGURATION_H__
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 #include "CCGL.h"
-#include "cocoa/CCString.h"
+#include "CCString.h"
 #include <string>
 
 

cocos/2d/CCDeprecated.h

@@ -29,7 +29,7 @@
 #define __COCOS2D_CCDEPRECATED_H__
 
 #include <math.h>
-#include "cocoa/CCGeometry.h"
+#include "CCGeometry.h"
 #include "ccTypes.h"
 
 NS_CC_BEGIN

cocos/2d/CCDirector.cpp

@@ -31,31 +31,31 @@ THE SOFTWARE.
 #include <string>
 
 #include "ccFPSImages.h"
-#include "draw_nodes/CCDrawingPrimitives.h"
+#include "CCDrawingPrimitives.h"
-#include "cocoa/CCNS.h"
+#include "CCNS.h"
-#include "layers_scenes_transitions_nodes/CCScene.h"
+#include "CCScene.h"
-#include "cocoa/CCArray.h"
+#include "CCArray.h"
 #include "CCScheduler.h"
 #include "ccMacros.h"
-#include "support/CCNotificationCenter.h"
+#include "CCNotificationCenter.h"
-#include "layers_scenes_transitions_nodes/CCTransition.h"
+#include "CCTransition.h"
-#include "textures/CCTextureCache.h"
+#include "CCTextureCache.h"
-#include "sprite_nodes/CCSpriteFrameCache.h"
+#include "CCSpriteFrameCache.h"
-#include "cocoa/CCAutoreleasePool.h"
+#include "CCAutoreleasePool.h"
 #include "platform/CCFileUtils.h"
 #include "CCApplication.h"
-#include "label_nodes/CCLabelBMFont.h"
+#include "CCLabelBMFont.h"
-#include "label_nodes/CCLabelAtlas.h"
+#include "CCLabelAtlas.h"
-#include "actions/CCActionManager.h"
+#include "CCActionManager.h"
-#include "sprite_nodes/CCAnimationCache.h"
+#include "CCAnimationCache.h"
-#include "event_dispatcher/CCTouch.h"
+#include "CCTouch.h"
-#include "event_dispatcher/CCEventDispatcher.h"
+#include "CCEventDispatcher.h"
-#include "support/user_default/CCUserDefault.h"
+#include "CCUserDefault.h"
-#include "shaders/ccGLStateCache.h"
+#include "ccGLStateCache.h"
-#include "shaders/CCShaderCache.h"
+#include "CCShaderCache.h"
 #include "kazmath/kazmath.h"
 #include "kazmath/GL/matrix.h"
-#include "support/CCProfiling.h"
+#include "CCProfiling.h"
 #include "platform/CCImage.h"
 #include "CCEGLView.h"
 #include "CCConfiguration.h"

cocos/2d/CCDirector.h

@@ -27,15 +27,15 @@ THE SOFTWARE.
 #ifndef __CCDIRECTOR_H__
 #define __CCDIRECTOR_H__
 
-#include "platform/CCPlatformMacros.h"
+#include "CCPlatformMacros.h"
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 #include "ccTypes.h"
-#include "cocoa/CCGeometry.h"
+#include "CCGeometry.h"
-#include "cocoa/CCArray.h"
+#include "CCArray.h"
 #include "CCGL.h"
 #include "kazmath/mat4.h"
-#include "label_nodes/CCLabelAtlas.h"
+#include "CCLabelAtlas.h"
 
 
 NS_CC_BEGIN

cocos/2d/CCDrawNode.cpp

@@ -21,9 +21,9 @@
  */
 
 #include "CCDrawNode.h"
-#include "shaders/CCShaderCache.h"
+#include "CCShaderCache.h"
 #include "CCGL.h"
-#include "support/CCNotificationCenter.h"
+#include "CCNotificationCenter.h"
 #include "CCEventType.h"
 
 NS_CC_BEGIN

cocos/2d/CCDrawNode.h

@@ -30,7 +30,7 @@
 #ifndef __CCDRAWNODES_CCDRAW_NODE_H__
 #define __CCDRAWNODES_CCDRAW_NODE_H__
 
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "ccTypes.h"
 
 NS_CC_BEGIN

cocos/2d/CCDrawingPrimitives.cpp

@@ -40,10 +40,10 @@ THE SOFTWARE.
 #include "ccMacros.h"
 #include "CCGL.h"
 #include "CCDirector.h"
-#include "shaders/ccGLStateCache.h"
+#include "ccGLStateCache.h"
-#include "shaders/CCShaderCache.h"
+#include "CCShaderCache.h"
-#include "shaders/CCGLProgram.h"
+#include "CCGLProgram.h"
-#include "actions/CCActionCatmullRom.h"
+#include "CCActionCatmullRom.h"
 #include <string.h>
 #include <cmath>
 

cocos/2d/CCDrawingPrimitives.h

@@ -42,7 +42,7 @@ THE SOFTWARE.
 
 #include "ccTypes.h"
 #include "ccMacros.h"
-#include "cocoa/CCGeometry.h"    // for Point
+#include "CCGeometry.h"    // for Point
 
 /**
  @file

cocos/2d/CCEvent.h

@@ -29,7 +29,7 @@
 #include <string>
 #include <stdint.h>
 
-#include "platform/CCPlatformMacros.h"
+#include "CCPlatformMacros.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCEventDispatcher.cpp

@@ -25,7 +25,7 @@
 #include "CCEvent.h"
 #include "CCEventTouch.h"
 #include "CCEventListenerTouch.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCDirector.h"
 
 #include <algorithm>

cocos/2d/CCEventDispatcher.h

@@ -25,7 +25,7 @@
 #ifndef __CC_EVENT_DISPATCHER_H__
 #define __CC_EVENT_DISPATCHER_H__
 
-#include "platform/CCPlatformMacros.h"
+#include "CCPlatformMacros.h"
 #include "CCEventListener.h"
 
 #include <functional>

cocos/2d/CCEventListener.h

@@ -25,8 +25,8 @@
 #ifndef cocos2d_libs_EventListener_h
 #define cocos2d_libs_EventListener_h
 
-#include "platform/CCPlatformMacros.h"
+#include "CCPlatformMacros.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 
 #include <functional>
 #include <string>

cocos/2d/CCEventListenerTouch.h

@@ -27,7 +27,7 @@
 #define __cocos2d_libs__CCTouchEventListener__
 
 #include "CCEventListener.h"
-#include "event_dispatcher/CCTouch.h"
+#include "CCTouch.h"
 
 #include <vector>
 

cocos/2d/CCEventTouch.h

@@ -26,7 +26,7 @@
 #define __cocos2d_libs__TouchEvent__
 
 #include "CCEvent.h"
-#include "event_dispatcher/CCTouch.h"
+#include "CCTouch.h"
 #include <vector>
 
 NS_CC_BEGIN

cocos/2d/CCFont.cpp

@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 #include "CCFont.h"
-#include "support/ccUTF8.h"
+#include "ccUTF8.h"
 
 #include "CCFontFNT.h"
 #include "CCFontFreeType.h"

cocos/2d/CCFontFreeType.cpp

@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 
-#include "support/ccUTF8.h"
+#include "ccUTF8.h"
 #include "CCFontFreeType.h"
 #include "CCTextImage.h"
 #include "CCFont.h"

cocos/2d/CCGLProgram.cpp

@@ -30,8 +30,8 @@ THE SOFTWARE.
 #include "ccGLStateCache.h"
 #include "ccMacros.h"
 #include "platform/CCFileUtils.h"
-#include "support/data_support/uthash.h"
+#include "uthash.h"
-#include "cocoa/CCString.h"
+#include "CCString.h"
 // extern
 #include "kazmath/GL/matrix.h"
 #include "kazmath/kazmath.h"

cocos/2d/CCGLProgram.h

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #define __CCGLPROGRAM_H__
 
 #include "ccMacros.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 
 #include "CCGL.h"
 

cocos/2d/CCGrabber.cpp

@@ -24,7 +24,7 @@ THE SOFTWARE.
 ****************************************************************************/
 #include "CCGrabber.h"
 #include "ccMacros.h"
-#include "textures/CCTexture2D.h"
+#include "CCTexture2D.h"
 
 NS_CC_BEGIN
 

cocos/2d/CCGrabber.h

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #define __EFFECTS_CCGRABBER_H__
 
 #include "CCConfiguration.h"
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
 #include "CCGL.h"
 
 NS_CC_BEGIN

cocos/2d/CCGrid.cpp

@@ -23,15 +23,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 #include "ccMacros.h"
-#include "effects/CCGrid.h"
+#include "CCGrid.h"
 #include "CCDirector.h"
-#include "effects/CCGrabber.h"
+#include "CCGrabber.h"
-#include "support/ccUtils.h"
+#include "ccUtils.h"
-#include "shaders/CCGLProgram.h"
+#include "CCGLProgram.h"
-#include "shaders/CCShaderCache.h"
+#include "CCShaderCache.h"
-#include "shaders/ccGLStateCache.h"
+#include "ccGLStateCache.h"
 #include "CCGL.h"
-#include "support/TransformUtils.h"
+#include "TransformUtils.h"
 #include "kazmath/kazmath.h"
 #include "kazmath/GL/matrix.h"
 

cocos/2d/CCGrid.h

@@ -25,15 +25,15 @@ THE SOFTWARE.
 #ifndef __EFFECTS_CCGRID_H__
 #define __EFFECTS_CCGRID_H__
 
-#include "cocoa/CCObject.h"
+#include "CCObject.h"
-#include "base_nodes/CCNode.h"
+#include "CCNode.h"
 #include "CCCamera.h"
 #include "ccTypes.h"
-#include "textures/CCTexture2D.h"
+#include "CCTexture2D.h"
 #include "CCDirector.h"
 #include "kazmath/mat4.h"
 #ifdef EMSCRIPTEN
-#include "base_nodes/CCGLBufferedNode.h"
+#include "CCGLBufferedNode.h"
 #endif // EMSCRIPTEN
 
 NS_CC_BEGIN

cocos/2d/CCIMEDelegate.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #ifndef __CC_IME_DELEGATE_H__
 #define __CC_IME_DELEGATE_H__
 
-#include "cocoa/CCGeometry.h"
+#include "CCGeometry.h"
 
 NS_CC_BEGIN