Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2905: helloworld build ok on android

This commit is contained in:
minggo 2013-10-14 14:01:00 +08:00
parent 1751cc3d89
commit 95acb1b9e3
417 changed files with 1035 additions and 1141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

340
cocos/2d/Android.mk
View File

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

2
cocos/2d/CCAction.cpp
View File

@ -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

6
cocos/2d/CCAction.h
View File

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

2
cocos/2d/CCActionCamera.cpp
View File

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

4
cocos/2d/CCActionCatmullRom.h
View File

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

2
cocos/2d/CCActionGrid.cpp
View File

@ -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

6
cocos/2d/CCActionInstant.cpp
View File

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

4
cocos/2d/CCActionInterval.cpp
View File

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

6
cocos/2d/CCActionInterval.h
View File

@ -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 "sprite_nodes/CCAnimation.h"
#include "CCSpriteFrame.h"
#include "CCAnimation.h"
#include <vector>
NS_CC_BEGIN

8
cocos/2d/CCActionManager.cpp
View File

@ -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 "support/data_support/uthash.h"
#include "cocoa/CCSet.h"
#include "ccCArray.h"
#include "uthash.h"
#include "CCSet.h"
NS_CC_BEGIN
//

4
cocos/2d/CCActionManager.h
View File

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

2
cocos/2d/CCActionProgressTimer.cpp
View File

@ -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

2
cocos/2d/CCActionTiledGrid.cpp
View File

@ -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

6
cocos/2d/CCAnimation.cpp
View File

@ -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 "textures/CCTexture2D.h"
#include "CCTextureCache.h"
#include "CCTexture2D.h"
#include "ccMacros.h"
#include "sprite_nodes/CCSpriteFrame.h"
#include "CCSpriteFrame.h"
NS_CC_BEGIN

10
cocos/2d/CCAnimation.h
View File

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

2
cocos/2d/CCAnimationCache.cpp
View File

@ -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;

4
cocos/2d/CCAnimationCache.h
View File

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

12
cocos/2d/CCAtlasNode.cpp
View File

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

4
cocos/2d/CCCamera.cpp
View File

@ -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"

2
cocos/2d/CCCamera.h
View File

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

6
cocos/2d/CCClippingNode.cpp
View File

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

2
cocos/2d/CCClippingNode.h
View File

@ -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

2
cocos/2d/CCComponent.cpp
View File

@ -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

2
cocos/2d/CCComponent.h
View File

@ -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

4
cocos/2d/CCComponentContainer.cpp
View File

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

2
cocos/2d/CCComponentContainer.h
View File

@ -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

6
cocos/2d/CCConfiguration.cpp
View File

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

4
cocos/2d/CCConfiguration.h
View File

@ -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>

2
cocos/2d/CCDeprecated.h
View File

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

38
cocos/2d/CCDirector.cpp
View File

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

10
cocos/2d/CCDirector.h
View File

@ -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 "cocoa/CCArray.h"
#include "CCGeometry.h"
#include "CCArray.h"
#include "CCGL.h"
#include "kazmath/mat4.h"
#include "label_nodes/CCLabelAtlas.h"
#include "CCLabelAtlas.h"
NS_CC_BEGIN

4
cocos/2d/CCDrawNode.cpp
View File

@ -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

2
cocos/2d/CCDrawNode.h
View File

@ -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

8
cocos/2d/CCDrawingPrimitives.cpp
View File

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

2
cocos/2d/CCDrawingPrimitives.h
View File

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

2
cocos/2d/CCEvent.h
View File

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

2
cocos/2d/CCEventDispatcher.cpp
View File

@ -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>

2
cocos/2d/CCEventDispatcher.h
View File

@ -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>

4
cocos/2d/CCEventListener.h
View File

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

2
cocos/2d/CCEventListenerTouch.h
View File

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

2
cocos/2d/CCEventTouch.h
View File

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

2
cocos/2d/CCFont.cpp
View File

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

2
cocos/2d/CCFontFreeType.cpp
View File

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

4
cocos/2d/CCGLProgram.cpp
View File

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

2
cocos/2d/CCGLProgram.h
View File

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

2
cocos/2d/CCGrabber.cpp
View File

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

2
cocos/2d/CCGrabber.h
View File

@ -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

14
cocos/2d/CCGrid.cpp
View File

@ -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 "support/ccUtils.h"
#include "shaders/CCGLProgram.h"
#include "shaders/CCShaderCache.h"
#include "shaders/ccGLStateCache.h"
#include "CCGrabber.h"
#include "ccUtils.h"
#include "CCGLProgram.h"
#include "CCShaderCache.h"
#include "ccGLStateCache.h"
#include "CCGL.h"
#include "support/TransformUtils.h"
#include "TransformUtils.h"
#include "kazmath/kazmath.h"
#include "kazmath/GL/matrix.h"

8
cocos/2d/CCGrid.h
View File

@ -25,15 +25,15 @@ THE SOFTWARE.
#ifndef __EFFECTS_CCGRID_H__
#define __EFFECTS_CCGRID_H__
#include "cocoa/CCObject.h"
#include "base_nodes/CCNode.h"
#include "CCObject.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

2
cocos/2d/CCIMEDelegate.h
View File

@ -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

2
cocos/2d/CCLabel.h
View File

@ -26,7 +26,7 @@
#ifndef _COCOS2D_CCLABEL_H_
#define _COCOS2D_CCLABEL_H_
#include "sprite_nodes/CCSpriteBatchNode.h"
#include "CCSpriteBatchNode.h"
#include "CCLabelTextFormatProtocol.h"
#include "ccTypes.h"

16
cocos/2d/CCLabelAtlas.cpp
View File

@ -24,16 +24,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCLabelAtlas.h"
#include "textures/CCTextureAtlas.h"
#include "textures/CCTextureCache.h"
#include "draw_nodes/CCDrawingPrimitives.h"
#include "CCTextureAtlas.h"
#include "CCTextureCache.h"
#include "CCDrawingPrimitives.h"
#include "ccConfig.h"
#include "shaders/CCShaderCache.h"
#include "shaders/CCGLProgram.h"
#include "shaders/ccGLStateCache.h"
#include "CCShaderCache.h"
#include "CCGLProgram.h"
#include "ccGLStateCache.h"
#include "CCDirector.h"
#include "support/TransformUtils.h"
#include "cocoa/CCInteger.h"
#include "TransformUtils.h"
#include "CCInteger.h"
#include "platform/CCFileUtils.h"
// external
#include "kazmath/GL/matrix.h"

2
cocos/2d/CCLabelAtlas.h
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#ifndef __CCLABEL_ATLAS_H__
#define __CCLABEL_ATLAS_H__
#include "base_nodes/CCAtlasNode.h"
#include "CCAtlasNode.h"
NS_CC_BEGIN

12
cocos/2d/CCLabelBMFont.cpp
View File

@ -31,15 +31,15 @@ http://www.angelcode.com/products/bmfont/ (Free, Windows only)
****************************************************************************/
#include "CCLabelBMFont.h"
#include "cocoa/CCString.h"
#include "cocoa/CCDictionary.h"
#include "CCString.h"
#include "CCDictionary.h"
#include "CCConfiguration.h"
#include "draw_nodes/CCDrawingPrimitives.h"
#include "sprite_nodes/CCSprite.h"
#include "CCDrawingPrimitives.h"
#include "CCSprite.h"
#include "platform/CCFileUtils.h"
#include "CCDirector.h"
#include "textures/CCTextureCache.h"
#include "support/ccUTF8.h"
#include "CCTextureCache.h"
#include "ccUTF8.h"
using namespace std;

4
cocos/2d/CCLabelBMFont.h
View File

@ -33,8 +33,8 @@ Use any of these editors to generate BMFonts:
#ifndef __CCBITMAP_FONT_ATLAS_H__
#define __CCBITMAP_FONT_ATLAS_H__
#include "sprite_nodes/CCSpriteBatchNode.h"
#include "support/data_support/uthash.h"
#include "CCSpriteBatchNode.h"
#include "uthash.h"
#include <map>
#include <sstream>
#include <iostream>

4
cocos/2d/CCLabelTTF.cpp
View File

@ -24,8 +24,8 @@ THE SOFTWARE.
****************************************************************************/
#include "CCLabelTTF.h"
#include "CCDirector.h"
#include "shaders/CCGLProgram.h"
#include "shaders/CCShaderCache.h"
#include "CCGLProgram.h"
#include "CCShaderCache.h"
#include "CCApplication.h"
NS_CC_BEGIN

4
cocos/2d/CCLabelTTF.h
View File

@ -25,8 +25,8 @@ THE SOFTWARE.
#ifndef __CCLABELTTF_H__
#define __CCLABELTTF_H__
#include "sprite_nodes/CCSprite.h"
#include "textures/CCTexture2D.h"
#include "CCSprite.h"
#include "CCTexture2D.h"
NS_CC_BEGIN

2
cocos/2d/CCLabelTextFormatter.cpp
View File

@ -25,7 +25,7 @@
#include <vector>
#include "cocos2d.h"
#include "support/ccUTF8.h"
#include "ccUTF8.h"
#include "CCLabelTextFormatter.h"
using namespace std;

24
cocos/2d/CCLayer.cpp
View File

@ -27,20 +27,20 @@ THE SOFTWARE.
#include <stdarg.h>
#include "CCLayer.h"
#include "CCDirector.h"
#include "script_support/CCScriptSupport.h"
#include "shaders/CCShaderCache.h"
#include "shaders/CCGLProgram.h"
#include "shaders/ccGLStateCache.h"
#include "support/TransformUtils.h"
#include "CCScriptSupport.h"
#include "CCShaderCache.h"
#include "CCGLProgram.h"
#include "ccGLStateCache.h"
#include "TransformUtils.h"
// extern
#include "kazmath/GL/matrix.h"
#include "event_dispatcher/CCEventDispatcher.h"
#include "event_dispatcher/CCEventListenerTouch.h"
#include "event_dispatcher/CCEventTouch.h"
#include "event_dispatcher/CCEventKeyboard.h"
#include "event_dispatcher/CCEventListenerKeyboard.h"
#include "event_dispatcher/CCEventAcceleration.h"
#include "event_dispatcher/CCEventListenerAcceleration.h"
#include "CCEventDispatcher.h"
#include "CCEventListenerTouch.h"
#include "CCEventTouch.h"
#include "CCEventKeyboard.h"
#include "CCEventListenerKeyboard.h"
#include "CCEventAcceleration.h"
#include "CCEventListenerAcceleration.h"
#include "platform/CCDevice.h"
#include "CCScene.h"

10
cocos/2d/CCLayer.h
View File

@ -27,15 +27,15 @@ THE SOFTWARE.
#ifndef __CCLAYER_H__
#define __CCLAYER_H__
#include "base_nodes/CCNode.h"
#include "CCNode.h"
#include "CCProtocols.h"
#include "cocoa/CCArray.h"
#include "CCArray.h"
#ifdef EMSCRIPTEN
#include "base_nodes/CCGLBufferedNode.h"
#include "CCGLBufferedNode.h"
#endif // EMSCRIPTEN
#include "physics/CCPhysicsSetting.h"
#include "CCPhysicsSetting.h"
#include "event_dispatcher/CCEventKeyboard.h"
#include "CCEventKeyboard.h"
NS_CC_BEGIN

6
cocos/2d/CCMenu.cpp
View File

@ -25,10 +25,10 @@ THE SOFTWARE.
#include "CCMenu.h"
#include "CCDirector.h"
#include "CCApplication.h"
#include "event_dispatcher/CCTouch.h"
#include "CCTouch.h"
#include "CCStdC.h"
#include "cocoa/CCInteger.h"
#include "event_dispatcher/CCEventListenerTouch.h"
#include "CCInteger.h"
#include "CCEventListenerTouch.h"
#include <vector>

4
cocos/2d/CCMenu.h
View File

@ -26,9 +26,9 @@ THE SOFTWARE.
#define __CCMENU_H_
#include "CCMenuItem.h"
#include "layers_scenes_transitions_nodes/CCLayer.h"
#include "CCLayer.h"
#include "event_dispatcher/CCEventTouch.h"
#include "CCEventTouch.h"
NS_CC_BEGIN

10
cocos/2d/CCMenuItem.cpp
View File

@ -25,11 +25,11 @@ THE SOFTWARE.
****************************************************************************/
#include "CCMenuItem.h"
#include "actions/CCActionInterval.h"
#include "sprite_nodes/CCSprite.h"
#include "label_nodes/CCLabelAtlas.h"
#include "label_nodes/CCLabelTTF.h"
#include "script_support/CCScriptSupport.h"
#include "CCActionInterval.h"
#include "CCSprite.h"
#include "CCLabelAtlas.h"
#include "CCLabelTTF.h"
#include "CCScriptSupport.h"
#include <stdarg.h>
#include <cstring>

4
cocos/2d/CCMenuItem.h
View File

@ -31,9 +31,9 @@ THE SOFTWARE.
#include <functional>
// cocos2d includes
#include "base_nodes/CCNode.h"
#include "CCNode.h"
#include "CCProtocols.h"
#include "cocoa/CCArray.h"
#include "CCArray.h"
NS_CC_BEGIN

10
cocos/2d/CCMotionStreak.cpp
View File

@ -23,13 +23,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCMotionStreak.h"
#include "textures/CCTextureCache.h"
#include "shaders/ccGLStateCache.h"
#include "shaders/CCGLProgram.h"
#include "shaders/CCShaderCache.h"
#include "CCTextureCache.h"
#include "ccGLStateCache.h"
#include "CCGLProgram.h"
#include "CCShaderCache.h"
#include "ccMacros.h"
#include "support/CCVertex.h"
#include "CCVertex.h"
NS_CC_BEGIN

6
cocos/2d/CCMotionStreak.h
View File

@ -26,11 +26,11 @@ THE SOFTWARE.
#define __CCMOTION_STREAK_H__
#include "CCProtocols.h"
#include "textures/CCTexture2D.h"
#include "CCTexture2D.h"
#include "ccTypes.h"
#include "base_nodes/CCNode.h"
#include "CCNode.h"
#ifdef EMSCRIPTEN
#include "base_nodes/CCGLBufferedNode.h"
#include "CCGLBufferedNode.h"
#endif // EMSCRIPTEN
NS_CC_BEGIN

28
cocos/2d/CCNode.cpp
View File

@ -29,29 +29,29 @@ THE SOFTWARE.
#include <algorithm>
#include "cocoa/CCString.h"
#include "support/data_support/ccCArray.h"
#include "support/TransformUtils.h"
#include "CCString.h"
#include "ccCArray.h"
#include "TransformUtils.h"
#include "CCCamera.h"
#include "effects/CCGrid.h"
#include "CCGrid.h"
#include "CCDirector.h"
#include "CCScheduler.h"
#include "event_dispatcher/CCTouch.h"
#include "actions/CCActionManager.h"
#include "script_support/CCScriptSupport.h"
#include "shaders/CCGLProgram.h"
#include "event_dispatcher/CCEventDispatcher.h"
#include "event_dispatcher/CCEvent.h"
#include "event_dispatcher/CCEventTouch.h"
#include "CCTouch.h"
#include "CCActionManager.h"
#include "CCScriptSupport.h"
#include "CCGLProgram.h"
#include "CCEventDispatcher.h"
#include "CCEvent.h"
#include "CCEventTouch.h"
#ifdef CC_USE_PHYSICS
#include "physics/CCPhysicsBody.h"
#include "CCPhysicsBody.h"
#endif
// externals
#include "kazmath/GL/matrix.h"
#include "support/component/CCComponent.h"
#include "support/component/CCComponentContainer.h"
#include "CCComponent.h"
#include "CCComponentContainer.h"

14
cocos/2d/CCNode.h
View File

@ -29,16 +29,16 @@
#define __PLATFORM_CCNODE_H__
#include "ccMacros.h"
#include "cocoa/CCAffineTransform.h"
#include "cocoa/CCArray.h"
#include "CCAffineTransform.h"
#include "CCArray.h"
#include "CCGL.h"
#include "shaders/ccGLStateCache.h"
#include "shaders/CCGLProgram.h"
#include "ccGLStateCache.h"
#include "CCGLProgram.h"
#include "kazmath/kazmath.h"
#include "script_support/CCScriptSupport.h"
#include "CCScriptSupport.h"
#include "CCProtocols.h"
#include "event_dispatcher/CCEventDispatcher.h"
#include "physics/CCPhysicsSetting.h"
#include "CCEventDispatcher.h"
#include "CCPhysicsSetting.h"
#include <vector>

4
cocos/2d/CCNotificationCenter.cpp
View File

@ -23,8 +23,8 @@ THE SOFTWARE.
****************************************************************************/
#include "CCNotificationCenter.h"
#include "cocoa/CCArray.h"
#include "script_support/CCScriptSupport.h"
#include "CCArray.h"
#include "CCScriptSupport.h"
#include <string>
using namespace std;

4
cocos/2d/CCNotificationCenter.h
View File

@ -25,8 +25,8 @@ THE SOFTWARE.
#ifndef __CCNOTIFICATIONCENTER_H__
#define __CCNOTIFICATIONCENTER_H__
#include "cocoa/CCObject.h"
#include "cocoa/CCArray.h"
#include "CCObject.h"
#include "CCArray.h"
NS_CC_BEGIN

2
cocos/2d/CCParallaxNode.cpp
View File

@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "CCParallaxNode.h"
#include "support/data_support/ccCArray.h"
#include "ccCArray.h"
NS_CC_BEGIN

4
cocos/2d/CCParallaxNode.h
View File

@ -26,8 +26,8 @@ THE SOFTWARE.
#ifndef __CCPARALLAX_NODE_H__
#define __CCPARALLAX_NODE_H__
#include "base_nodes/CCNode.h"
/*#include "support/data_support/ccArray.h"*/
#include "CCNode.h"
/*#include "ccArray.h"*/
NS_CC_BEGIN

18
cocos/2d/CCParticleBatchNode.cpp
View File

@ -28,20 +28,20 @@
*/
#include "CCParticleBatchNode.h"
#include "textures/CCTextureCache.h"
#include "textures/CCTextureAtlas.h"
#include "CCTextureCache.h"
#include "CCTextureAtlas.h"
#include "ccConfig.h"
#include "ccMacros.h"
#include "effects/CCGrid.h"
#include "CCGrid.h"
#include "CCParticleSystem.h"
#include "shaders/CCShaderCache.h"
#include "shaders/CCGLProgram.h"
#include "shaders/ccGLStateCache.h"
#include "support/base64.h"
#include "support/zip_support/ZipUtils.h"
#include "CCShaderCache.h"
#include "CCGLProgram.h"
#include "ccGLStateCache.h"
#include "base64.h"
#include "ZipUtils.h"
#include "platform/CCFileUtils.h"
#include "kazmath/GL/matrix.h"
#include "support/CCProfiling.h"
#include "CCProfiling.h"
NS_CC_BEGIN

2
cocos/2d/CCParticleBatchNode.h
View File

@ -29,7 +29,7 @@
#ifndef __CCPARTICLEBATCHNODE_H__
#define __CCPARTICLEBATCHNODE_H__
#include "base_nodes/CCNode.h"
#include "CCNode.h"
#include "CCProtocols.h"
NS_CC_BEGIN

2
cocos/2d/CCParticleExamples.cpp
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
****************************************************************************/
#include "CCParticleExamples.h"
#include "CCDirector.h"
#include "textures/CCTextureCache.h"
#include "CCTextureCache.h"
#include "firePngData.h"
#include "platform/CCImage.h"

10
cocos/2d/CCParticleSystem.cpp
View File

@ -47,14 +47,14 @@ THE SOFTWARE.
#include "CCParticleBatchNode.h"
#include "ccTypes.h"
#include "textures/CCTextureCache.h"
#include "textures/CCTextureAtlas.h"
#include "support/base64.h"
#include "CCTextureCache.h"
#include "CCTextureAtlas.h"
#include "base64.h"
#include "platform/CCFileUtils.h"
#include "platform/CCImage.h"
#include "support/zip_support/ZipUtils.h"
#include "ZipUtils.h"
#include "CCDirector.h"
#include "support/CCProfiling.h"
#include "CCProfiling.h"
// opengl
#include "CCGL.h"

6
cocos/2d/CCParticleSystem.h
View File

@ -27,9 +27,9 @@ THE SOFTWARE.
#define __CCPARTICLE_SYSTEM_H__
#include "CCProtocols.h"
#include "base_nodes/CCNode.h"
#include "cocoa/CCDictionary.h"
#include "cocoa/CCString.h"
#include "CCNode.h"
#include "CCDictionary.h"
#include "CCString.h"
NS_CC_BEGIN

14
cocos/2d/CCParticleSystemQuad.cpp
View File

@ -27,15 +27,15 @@ THE SOFTWARE.
#include "CCGL.h"
#include "CCParticleSystemQuad.h"
#include "sprite_nodes/CCSpriteFrame.h"
#include "CCSpriteFrame.h"
#include "CCDirector.h"
#include "CCParticleBatchNode.h"
#include "textures/CCTextureAtlas.h"
#include "shaders/CCShaderCache.h"
#include "shaders/ccGLStateCache.h"
#include "shaders/CCGLProgram.h"
#include "support/TransformUtils.h"
#include "support/CCNotificationCenter.h"
#include "CCTextureAtlas.h"
#include "CCShaderCache.h"
#include "ccGLStateCache.h"
#include "CCGLProgram.h"
#include "TransformUtils.h"
#include "CCNotificationCenter.h"
#include "CCEventType.h"
// extern

4
cocos/2d/CCProfiling.h
View File

@ -28,8 +28,8 @@ THE SOFTWARE.
#include <string>
#include <chrono>
#include "ccConfig.h"
#include "cocoa/CCObject.h"
#include "cocoa/CCDictionary.h"
#include "CCObject.h"
#include "CCDictionary.h"
NS_CC_BEGIN

12
cocos/2d/CCProgressTimer.cpp
View File

@ -25,13 +25,13 @@ THE SOFTWARE.
#include "CCProgressTimer.h"
#include "ccMacros.h"
#include "textures/CCTextureCache.h"
#include "shaders/CCGLProgram.h"
#include "shaders/CCShaderCache.h"
#include "shaders/ccGLStateCache.h"
#include "CCTextureCache.h"
#include "CCGLProgram.h"
#include "CCShaderCache.h"
#include "ccGLStateCache.h"
#include "CCDirector.h"
#include "support/TransformUtils.h"
#include "draw_nodes/CCDrawingPrimitives.h"
#include "TransformUtils.h"
#include "CCDrawingPrimitives.h"
// extern
#include "kazmath/GL/matrix.h"

4
cocos/2d/CCProgressTimer.h
View File

@ -25,9 +25,9 @@ THE SOFTWARE.
#ifndef __MISC_NODE_CCPROGRESS_TIMER_H__
#define __MISC_NODE_CCPROGRESS_TIMER_H__
#include "sprite_nodes/CCSprite.h"
#include "CCSprite.h"
#ifdef EMSCRIPTEN
#include "base_nodes/CCGLBufferedNode.h"
#include "CCGLBufferedNode.h"
#endif // EMSCRIPTEN
NS_CC_BEGIN

2
cocos/2d/CCProtocols.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#define __CCPROTOCOLS_H__
#include "ccTypes.h"
#include "textures/CCTexture2D.h"
#include "CCTexture2D.h"
#include <string>
NS_CC_BEGIN

14
cocos/2d/CCRenderTexture.cpp
View File

@ -24,19 +24,19 @@ THE SOFTWARE.
****************************************************************************/
#include "CCConfiguration.h"
#include "misc_nodes/CCRenderTexture.h"
#include "CCRenderTexture.h"
#include "CCDirector.h"
#include "platform/CCImage.h"
#include "shaders/CCGLProgram.h"
#include "shaders/ccGLStateCache.h"
#include "CCGLProgram.h"
#include "ccGLStateCache.h"
#include "CCConfiguration.h"
#include "support/ccUtils.h"
#include "textures/CCTextureCache.h"
#include "ccUtils.h"
#include "CCTextureCache.h"
#include "platform/CCFileUtils.h"
#include "CCGL.h"
#include "support/CCNotificationCenter.h"
#include "CCNotificationCenter.h"
#include "CCEventType.h"
#include "effects/CCGrid.h"
#include "CCGrid.h"
// extern
#include "kazmath/GL/matrix.h"

4
cocos/2d/CCRenderTexture.h
View File

@ -25,8 +25,8 @@ THE SOFTWARE.
#ifndef __CCRENDER_TEXTURE_H__
#define __CCRENDER_TEXTURE_H__
#include "base_nodes/CCNode.h"
#include "sprite_nodes/CCSprite.h"
#include "CCNode.h"
#include "CCSprite.h"
#include "kazmath/mat4.h"
#include "platform/CCImage.h"

6
cocos/2d/CCScene.cpp
View File

@ -27,9 +27,9 @@ THE SOFTWARE.
#include "CCScene.h"
#include "CCDirector.h"
#include "CCLayer.h"
#include "sprite_nodes/CCSprite.h"
#include "sprite_nodes/CCSpriteBatchNode.h"
#include "physics/CCPhysicsWorld.h"
#include "CCSprite.h"
#include "CCSpriteBatchNode.h"
#include "CCPhysicsWorld.h"
NS_CC_BEGIN

4
cocos/2d/CCScene.h
View File

@ -27,8 +27,8 @@ THE SOFTWARE.
#ifndef __CCSCENE_H__
#define __CCSCENE_H__
#include "base_nodes/CCNode.h"
#include "physics/CCPhysicsWorld.h"
#include "CCNode.h"
#include "CCPhysicsWorld.h"
NS_CC_BEGIN

8
cocos/2d/CCScheduler.cpp
View File

@ -27,10 +27,10 @@ THE SOFTWARE.
#include "CCScheduler.h"
#include "ccMacros.h"
#include "CCDirector.h"
#include "support/data_support/utlist.h"
#include "support/data_support/ccCArray.h"
#include "cocoa/CCArray.h"
#include "script_support/CCScriptSupport.h"
#include "utlist.h"
#include "ccCArray.h"
#include "CCArray.h"
#include "CCScriptSupport.h"
using namespace std;

4
cocos/2d/CCScheduler.h
View File

@ -27,8 +27,8 @@ THE SOFTWARE.
#ifndef __CCSCHEDULER_H__
#define __CCSCHEDULER_H__
#include "cocoa/CCObject.h"
#include "support/data_support/uthash.h"
#include "CCObject.h"
#include "uthash.h"
NS_CC_BEGIN

8
cocos/2d/CCScriptSupport.h
View File

@ -26,10 +26,10 @@
#define __SCRIPT_SUPPORT_H__
#include "platform/CCCommon.h"
#include "event_dispatcher/CCTouch.h"
#include "event_dispatcher/CCEventTouch.h"
#include "event_dispatcher/CCEventKeyboard.h"
#include "cocoa/CCSet.h"
#include "CCTouch.h"
#include "CCEventTouch.h"
#include "CCEventKeyboard.h"
#include "CCSet.h"
#include <map>
#include <string>
#include <list>

2
cocos/2d/CCShaderCache.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include <string>
#include <unordered_map>
#include "cocoa/CCDictionary.h"
#include "CCDictionary.h"
NS_CC_BEGIN

20
cocos/2d/CCSprite.cpp
View File

@ -33,17 +33,17 @@ THE SOFTWARE.
#include "CCSprite.h"
#include "CCSpriteFrame.h"
#include "CCSpriteFrameCache.h"
#include "textures/CCTextureCache.h"
#include "draw_nodes/CCDrawingPrimitives.h"
#include "shaders/CCShaderCache.h"
#include "shaders/ccGLStateCache.h"
#include "shaders/CCGLProgram.h"
#include "CCTextureCache.h"
#include "CCDrawingPrimitives.h"
#include "CCShaderCache.h"
#include "ccGLStateCache.h"
#include "CCGLProgram.h"
#include "CCDirector.h"
#include "cocoa/CCGeometry.h"
#include "textures/CCTexture2D.h"
#include "cocoa/CCAffineTransform.h"
#include "support/TransformUtils.h"
#include "support/CCProfiling.h"
#include "CCGeometry.h"
#include "CCTexture2D.h"
#include "CCAffineTransform.h"
#include "TransformUtils.h"
#include "CCProfiling.h"
// external
#include "kazmath/GL/matrix.h"

10
cocos/2d/CCSprite.h
View File

@ -27,16 +27,16 @@ THE SOFTWARE.
#ifndef __SPITE_NODE_CCSPRITE_H__
#define __SPITE_NODE_CCSPRITE_H__
#include "base_nodes/CCNode.h"
#include "CCNode.h"
#include "CCProtocols.h"
#include "textures/CCTextureAtlas.h"
#include "CCTextureAtlas.h"
#include "ccTypes.h"
#include "cocoa/CCDictionary.h"
#include "CCDictionary.h"
#include <string>
#ifdef EMSCRIPTEN
#include "base_nodes/CCGLBufferedNode.h"
#include "CCGLBufferedNode.h"
#endif // EMSCRIPTEN
#include "physics/CCPhysicsBody.h"
#include "CCPhysicsBody.h"
NS_CC_BEGIN

20
cocos/2d/CCSpriteBatchNode.cpp
View File

@ -31,17 +31,17 @@ THE SOFTWARE.
#include "ccConfig.h"
#include "CCSprite.h"
#include "effects/CCGrid.h"
#include "draw_nodes/CCDrawingPrimitives.h"
#include "textures/CCTextureCache.h"
#include "shaders/CCShaderCache.h"
#include "shaders/CCGLProgram.h"
#include "shaders/ccGLStateCache.h"
#include "CCGrid.h"
#include "CCDrawingPrimitives.h"
#include "CCTextureCache.h"
#include "CCShaderCache.h"
#include "CCGLProgram.h"
#include "ccGLStateCache.h"
#include "CCDirector.h"
#include "support/TransformUtils.h"
#include "support/CCProfiling.h"
#include "layers_scenes_transitions_nodes/CCLayer.h"
#include "layers_scenes_transitions_nodes/CCScene.h"
#include "TransformUtils.h"
#include "CCProfiling.h"
#include "CCLayer.h"
#include "CCScene.h"
// external
#include "kazmath/GL/matrix.h"

4
cocos/2d/CCSpriteBatchNode.h
View File

@ -30,9 +30,9 @@ THE SOFTWARE.
#include <vector>
#include "base_nodes/CCNode.h"
#include "CCNode.h"
#include "CCProtocols.h"
#include "textures/CCTextureAtlas.h"
#include "CCTextureAtlas.h"
#include "ccMacros.h"
NS_CC_BEGIN

2
cocos/2d/CCSpriteFrame.cpp
View File

@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "textures/CCTextureCache.h"
#include "CCTextureCache.h"
#include "CCSpriteFrame.h"
#include "CCDirector.h"

6
cocos/2d/CCSpriteFrame.h
View File

@ -27,10 +27,10 @@ THE SOFTWARE.
#ifndef __SPRITE_CCSPRITE_FRAME_H__
#define __SPRITE_CCSPRITE_FRAME_H__
#include "base_nodes/CCNode.h"
#include "CCNode.h"
#include "CCProtocols.h"
#include "cocoa/CCObject.h"
#include "cocoa/CCGeometry.h"
#include "CCObject.h"
#include "CCGeometry.h"
NS_CC_BEGIN

12
cocos/2d/CCSpriteFrameCache.cpp
View File

@ -26,17 +26,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "cocoa/CCNS.h"
#include "CCNS.h"
#include "ccMacros.h"
#include "textures/CCTextureCache.h"
#include "CCTextureCache.h"
#include "CCSpriteFrameCache.h"
#include "CCSpriteFrame.h"
#include "CCSprite.h"
#include "support/TransformUtils.h"
#include "TransformUtils.h"
#include "platform/CCFileUtils.h"
#include "cocoa/CCString.h"
#include "cocoa/CCArray.h"
#include "cocoa/CCDictionary.h"
#include "CCString.h"
#include "CCArray.h"
#include "CCDictionary.h"
#include <vector>
using namespace std;

6
cocos/2d/CCSpriteFrameCache.h
View File

@ -34,9 +34,9 @@ THE SOFTWARE.
* http://zwoptex.zwopple.com/
*/
#include "sprite_nodes/CCSpriteFrame.h"
#include "textures/CCTexture2D.h"
#include "cocoa/CCObject.h"
#include "CCSpriteFrame.h"
#include "CCTexture2D.h"
#include "CCObject.h"
#include <set>
#include <string>

10
cocos/2d/CCTMXLayer.cpp
View File

@ -26,11 +26,11 @@ THE SOFTWARE.
#include "CCTMXLayer.h"
#include "CCTMXXMLParser.h"
#include "CCTMXTiledMap.h"
#include "sprite_nodes/CCSprite.h"
#include "textures/CCTextureCache.h"
#include "shaders/CCShaderCache.h"
#include "shaders/CCGLProgram.h"
#include "support/data_support/ccCArray.h"
#include "CCSprite.h"
#include "CCTextureCache.h"
#include "CCShaderCache.h"
#include "CCGLProgram.h"
#include "ccCArray.h"
#include "CCDirector.h"
NS_CC_BEGIN

6
cocos/2d/CCTMXLayer.h
View File

@ -27,10 +27,10 @@ THE SOFTWARE.
#define __CCTMX_LAYER_H__
#include "CCTMXObjectGroup.h"
#include "base_nodes/CCAtlasNode.h"
#include "sprite_nodes/CCSpriteBatchNode.h"
#include "CCAtlasNode.h"
#include "CCSpriteBatchNode.h"
#include "CCTMXXMLParser.h"
#include "support/data_support/ccCArray.h"
#include "ccCArray.h"
NS_CC_BEGIN
class TMXMapInfo;

Some files were not shown because too many files have changed in this diff Show More