Changeset 8729 for code/trunk/src/external/bullet

Timestamp:

Jul 4, 2011, 2:47:44 AM (13 years ago)

Author:

rgrieder

Message:

Merged unity_build branch back to trunk.

Features:

• Implemented fully automatic build units to speed up compilation if requested
• Added DOUT macro for quick debug output
• Activated text colouring in the POSIX IOConsole
• DeclareToluaInterface is not necessary anymore

Improvements:

• Output levels now change appropriately when switch back and forth from dev mode
• Log level for the file output is now also correct during startup
• Removed some header file dependencies in core and tools to speed up compilation

no more file for command line options

• Improved util::tribool by adapting some concepts from boost::tribool

Regressions:

• It is not possible anymore to specify command line arguments in an extra file because we've got config values for that purpose.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/CMakeLists.txt (modified) (2 diffs)
• src/external/bullet/BulletDynamics/CMakeLists.txt (modified) (2 diffs)
• src/external/bullet/CMakeLists.txt (modified) (1 diff)
• src/external/bullet/LinearMath/CMakeLists.txt (modified) (2 diffs)

code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
-
-COMPILATION_BEGIN BulletCollisionCompilation.cpp
 
         BroadphaseCollision/btAxisSweep3.cpp
@@ -84 +82 @@
         NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
         NarrowPhaseCollision/btPersistentManifold.cpp
+        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
         NarrowPhaseCollision/btRaycastCallback.cpp
         NarrowPhaseCollision/btSubSimplexConvexCast.cpp
         NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
 
-COMPILATION_END
-
-    # Raises compiler errors when compiled inside the compilation
-        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
 
         # Headers

code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
-
-COMPILATION_BEGIN BulletDynamicsCompilation.cpp
 
         Character/btKinematicCharacterController.cpp
@@ -25 +23 @@
         Vehicle/btRaycastVehicle.cpp
         Vehicle/btWheelInfo.cpp
-
-COMPILATION_END
 
         # Headers

code/trunk/src/external/bullet/CMakeLists.txt

@@ -32 +32 @@
   VERSION
     2.78
+  EXCLUDE_FROM_BUILD_UNITS
+    BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
   SOURCE_FILES
     ${BULLET_FILES}

code/trunk/src/external/bullet/LinearMath/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(BULLET_FILES
 
-COMPILATION_BEGIN BulletLinearMathCompilation.cpp
         btAlignedAllocator.cpp
         btConvexHull.cpp
-    btConvexHullComputer.cpp
+        btConvexHullComputer.cpp
         btGeometryUtil.cpp
         btQuickprof.cpp
         btSerializer.cpp
-COMPILATION_END
 
         # Headers
@@ -15 +13 @@
         btAlignedObjectArray.h
         btConvexHull.h
-    btConvexHullComputer.h
+        btConvexHullComputer.h
         btDefaultMotionState.h
         btGeometryUtil.h