From fe075891417ba0a86f51c4a53913c69878112d50 Mon Sep 17 00:00:00 2001 From: cpascal Date: Mon, 22 Sep 2014 14:25:47 +0900 Subject: [PATCH] Fixed my mistakes - preprocessor. --- extensions/physics-nodes/CCPhysicsSprite.cpp | 4 ++-- extensions/physics-nodes/CCPhysicsSprite.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/physics-nodes/CCPhysicsSprite.cpp b/extensions/physics-nodes/CCPhysicsSprite.cpp index 1a4d69c88b..96011e2d4d 100644 --- a/extensions/physics-nodes/CCPhysicsSprite.cpp +++ b/extensions/physics-nodes/CCPhysicsSprite.cpp @@ -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 diff --git a/extensions/physics-nodes/CCPhysicsSprite.h b/extensions/physics-nodes/CCPhysicsSprite.h index a42dfcb6e5..7d68e7ca1a 100644 --- a/extensions/physics-nodes/CCPhysicsSprite.h +++ b/extensions/physics-nodes/CCPhysicsSprite.h @@ -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__