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

Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x

This commit is contained in:
sunzhuoshi 2013-07-16 15:04:51 +08:00
parent 8cad37a8d8 edda79c703
commit 6d0f7dfe88
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/cocos-ext.h
View File

@ -47,7 +47,9 @@
#include "physics_nodes/CCPhysicsSprite.h" #include "physics_nodes/CCPhysicsSprite.h"
#endif #endif
#if CC_ENABLE_SPINE_INTEGRATION
#include "spine/spine-cocos2dx.h" #include "spine/spine-cocos2dx.h"
#endif
#include "Components/CCComAttribute.h" #include "Components/CCComAttribute.h"
#include "Components/CCComAudio.h" #include "Components/CCComAudio.h"