Merge pull request #4428 from boyu0/iss2771_move_CC_USE_PHYSICS_to_header

issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 19:55:10 -08:00 · 2013-12-04 19:55:10 -08:00 · 14ab7ccd16
parent 4214ad231e 98779b0a9f
commit 14ab7ccd16
21 changed files with 28 additions and 12 deletions
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@ -1 +1 @@
-4367613b05de13587c6cd0fb07aeef45f44afcfc
+70579540615cf1d2f1ed86cc4789e1424144c616
--- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
@ -1 +1 @@
-edf83dc058b5630510ac8d327ae8db62ab062cc6
+d9ca56584f41cdc53df610c01b375de066b4844b
--- a/cocos/2d/ccConfig.h
+++ b/cocos/2d/ccConfig.h
@ -266,4 +266,9 @@ To enable set it to a value different than 0. Disabled by default.
 #define CC_LUA_ENGINE_DEBUG 0
 #endif

+/** Use physics integration API */
+#ifndef CC_USE_PHYSICS
+#define CC_USE_PHYSICS
+#endif
+
 #endif // __CCCONFIG_H__
--- a/cocos/2d/cocos2d.vcxproj
+++ b/cocos/2d/cocos2d.vcxproj
@ -74,7 +74,7 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;CC_USE_PHYSICS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -121,7 +121,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;CC_USE_PHYSICS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
--- a/cocos/physics/CCPhysicsBody.h
+++ b/cocos/physics/CCPhysicsBody.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_BODY_H__
 #define __CCPHYSICS_BODY_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "CCObject.h"
--- a/cocos/physics/CCPhysicsContact.h
+++ b/cocos/physics/CCPhysicsContact.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_CONTACT_H__
 #define __CCPHYSICS_CONTACT_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "CCObject.h"
--- a/cocos/physics/CCPhysicsJoint.h
+++ b/cocos/physics/CCPhysicsJoint.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_JOINT_H__
 #define __CCPHYSICS_JOINT_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "CCObject.h"
--- a/cocos/physics/CCPhysicsShape.h
+++ b/cocos/physics/CCPhysicsShape.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_SHAPE_H__
 #define __CCPHYSICS_SHAPE_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "CCObject.h"
--- a/cocos/physics/CCPhysicsWorld.h
+++ b/cocos/physics/CCPhysicsWorld.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_WORLD_H__
 #define __CCPHYSICS_WORLD_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include <list>
--- a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.cpp
+++ b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.cpp
@ -22,8 +22,8 @@
 THE SOFTWARE.
 ****************************************************************************/

-#ifdef CC_USE_PHYSICS
 #include "CCPhysicsBodyInfo_chipmunk.h"
+#ifdef CC_USE_PHYSICS
 NS_CC_BEGIN

 PhysicsBodyInfo::PhysicsBodyInfo()
--- a/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsBodyInfo_chipmunk.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_BODY_INFO_CHIPMUNK_H__
 #define __CCPHYSICS_BODY_INFO_CHIPMUNK_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "chipmunk.h"
--- a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp
+++ b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.cpp
@ -22,8 +22,8 @@
 THE SOFTWARE.
 ****************************************************************************/

-#ifdef CC_USE_PHYSICS
 #include "CCPhysicsContactInfo_chipmunk.h"
+#ifdef CC_USE_PHYSICS
 NS_CC_BEGIN

 PhysicsContactInfo::PhysicsContactInfo(PhysicsContact* contact)
--- a/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsContactInfo_chipmunk.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__
 #define __CCPHYSICS_CONTACT_INFO_CHIPMUNK_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "chipmunk.h"
--- a/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsHelper_chipmunk.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_HELPER_CHIPMUNK_H__
 #define __CCPHYSICS_HELPER_CHIPMUNK_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "chipmunk.h"
--- a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.cpp
+++ b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.cpp
@ -22,8 +22,8 @@
 THE SOFTWARE.
 ****************************************************************************/

-#ifdef CC_USE_PHYSICS
 #include "CCPhysicsJointInfo_chipmunk.h"
+#ifdef CC_USE_PHYSICS
 #include <algorithm>
 #include <unordered_map>

--- a/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsJointInfo_chipmunk.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__
 #define __CCPHYSICS_JOINT_INFO_CHIPMUNK_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include "chipmunk.h"
--- a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.cpp
+++ b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.cpp
@ -22,8 +22,8 @@
 THE SOFTWARE.
 ****************************************************************************/

-#ifdef CC_USE_PHYSICS
 #include "CCPhysicsShapeInfo_chipmunk.h"
+#ifdef CC_USE_PHYSICS
 #include <algorithm>
 #include <unordered_map>

--- a/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsShapeInfo_chipmunk.h
@ -25,7 +25,8 @@
 #ifndef __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__
 #define __CCPHYSICS_SHAPE_INFO_CHIPMUNK_H__

-#if CC_USE_PHYSICS
+#include "ccConfig.h"
+#ifdef CC_USE_PHYSICS

 #include <vector>
 #include <unordered_map>
--- a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp
+++ b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp
@ -22,8 +22,8 @@
 THE SOFTWARE.
 ****************************************************************************/

-#ifdef CC_USE_PHYSICS
 #include "CCPhysicsWorldInfo_chipmunk.h"
+#ifdef CC_USE_PHYSICS
 #include "CCPhysicsHelper_chipmunk.h"
 #include "CCPhysicsBodyInfo_chipmunk.h"
 #include "CCPhysicsShapeInfo_chipmunk.h"
--- a/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h
+++ b/cocos/physics/chipmunk/CCPhysicsWorldInfo_chipmunk.h
@ -25,6 +25,7 @@
 #ifndef __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__
 #define __CCPHYSICS_WORLD_INFO_CHIPMUNK_H__

+#include "ccConfig.h"
 #ifdef CC_USE_PHYSICS

 #include <vector>
--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
+++ b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
@ -70,7 +70,7 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_USE_PHYSICS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <PrecompiledHeader>
@ -103,7 +103,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
      <Optimization>MaxSpeed</Optimization>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <AdditionalIncludeDirectories>..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_USE_PHYSICS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>