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

This commit is contained in:
Walzer 2010-12-13 11:05:29 +08:00
commit 0766e7cf35
2 changed files with 20 additions and 0 deletions

View File

@ -3,6 +3,16 @@
#include "cocos2d.h"
[! if CCX_USE_BOX2D]
#include "Box2D.h"
[! endif]
[! if CCX_USE_CHIPMUNK]
#include "chipmunk.h"
[! endif]
[! if CCX_USE_COCOS_DENSHION_SIMPLE_AUDIO_ENGINE]
#include "SimpleAudioEngine.h"
[! endif]
class HelloWorld : public cocos2d::CCLayer
{
public:

View File

@ -4,6 +4,16 @@
#include "cocos2d.h"
[! if CCX_USE_BOX2D]
#include "Box2D.h"
[! endif]
[! if CCX_USE_CHIPMUNK]
#include "chipmunk.h"
[! endif]
[! if CCX_USE_COCOS_DENSHION_SIMPLE_AUDIO_ENGINE]
#include "SimpleAudioEngine.h"
[! endif]
class HelloWorld : public cocos2d::CCLayer
{
public: