mirror of https://github.com/axmolengine/axmol.git
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
This commit is contained in:
commit
0766e7cf35
|
@ -3,6 +3,16 @@
|
||||||
|
|
||||||
#include "cocos2d.h"
|
#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
|
class HelloWorld : public cocos2d::CCLayer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -4,6 +4,16 @@
|
||||||
|
|
||||||
#include "cocos2d.h"
|
#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
|
class HelloWorld : public cocos2d::CCLayer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
Loading…
Reference in New Issue