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

Fixed my mistakes - preprocessor.

This commit is contained in:
cpascal 2014-09-22 14:25:47 +09:00
parent 07f5568ae8
commit fe07589141
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/physics-nodes/CCPhysicsSprite.cpp
View File

@ -22,7 +22,7 @@
#include "CCPhysicsSprite.h"
#if (!CC_ENABLE_CHIPMUNK_INTEGRATION && !CC_ENABLE_BOX2D_INTEGRATION)
#if (CC_ENABLE_CHIPMUNK_INTEGRATION || CC_ENABLE_BOX2D_INTEGRATION)
#if (CC_ENABLE_CHIPMUNK_INTEGRATION && CC_ENABLE_BOX2D_INTEGRATION)
#error "Either Chipmunk or Box2d should be enabled, but not both at the same time"
@ -413,4 +413,4 @@ void PhysicsSprite::draw(Renderer *renderer, const Mat4 &transform, uint32_t fla
NS_CC_EXT_END
#endif // !CC_ENABLE_CHIPMUNK_INTEGRATION && !CC_ENABLE_BOX2D_INTEGRATION
#endif // CC_ENABLE_CHIPMUNK_INTEGRATION || CC_ENABLE_BOX2D_INTEGRATION

4
extensions/physics-nodes/CCPhysicsSprite.h
View File

@ -27,7 +27,7 @@
#include "extensions/ExtensionMacros.h"
#include "extensions/ExtensionExport.h"
#if (!CC_ENABLE_CHIPMUNK_INTEGRATION && !CC_ENABLE_BOX2D_INTEGRATION)
#if (CC_ENABLE_CHIPMUNK_INTEGRATION || CC_ENABLE_BOX2D_INTEGRATION)
struct cpBody;
class b2Body;
@ -137,6 +137,6 @@ protected:
NS_CC_EXT_END
#endif // !CC_ENABLE_CHIPMUNK_INTEGRATION && !CC_ENABLE_BOX2D_INTEGRATION
#endif // CC_ENABLE_CHIPMUNK_INTEGRATION || CC_ENABLE_BOX2D_INTEGRATION
#endif // __PHYSICSNODES_CCPHYSICSSPRITE_H__