First commit of 2008, Happy New Year!

Add option to compile without btClock and without profiling: comment out USE_BT_CLOCK, and #define BT_NO_PROFILE
Fixed typo/case in #include "LinearMath/btQuickProf.h", in SpuParallelSolver.cpp
Removed unnecessary files from libxml CMakeLists.txt

Extras/BulletMultiThreaded/SpuParallelSolver.cpp

@@ -28,7 +28,7 @@ Written by: Marten Svanfeldt
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
-#include "LinearMath/btQuickProf.h"
+#include "LinearMath/btQuickprof.h"
 
 #include "SpuSolverTask/SpuParallellSolverTask.h"
 

Extras/ConvexDecomposition/concavity.cpp

@@ -596,7 +596,7 @@ float computeConcavity(unsigned int vcount,
 
   if ( ret == QE_OK )
   {
-
+#if 0
 		float bmin[3];
 		float bmax[3];
 
@@ -609,6 +609,7 @@ float computeConcavity(unsigned int vcount,
 		center.x = bmin[0] + dx*0.5f;
 		center.y = bmin[1] + dy*0.5f;
 		center.z = bmin[2] + dz*0.5f;
+#endif
 
 		volume = computeMeshVolume2( result.mOutputVertices, result.mNumFaces, result.mIndices );
 

Extras/GIMPACT/src/Bullet/btGImpactBvh.cpp

@@ -23,8 +23,9 @@ subject to the following restrictions:
 #include "GIMPACT/Bullet/btGImpactBvh.h"
 #include "LinearMath/btQuickprof.h"
 
-btClock g_tree_clock;
+#ifdef TRI_COLLISION_PROFILING
 
+btClock g_tree_clock;
 
 float g_accum_tree_collision_time = 0;
 int g_count_traversing = 0;
@@ -59,6 +60,7 @@ float btGImpactBvh::getAverageTreeCollisionTime()
 
 }
 
+#endif //TRI_COLLISION_PROFILING
 
 /////////////////////// btBvhTree /////////////////////////////////
 
@@ -482,12 +484,16 @@ void btGImpactBvh::find_collision(btGImpactBvh * boxset0, const btTransform & tr
 
 	trans_cache_1to0.calc_from_homogenic(trans0,trans1);
 
+#ifdef TRI_COLLISION_PROFILING
 	bt_begin_gim02_tree_time();
+#endif //TRI_COLLISION_PROFILING
 
 	_find_collision_pairs_recursive(
 		boxset0,boxset1,
 		&collision_pairs,trans_cache_1to0,0,0,true);
-
+#ifdef TRI_COLLISION_PROFILING
 	bt_end_gim02_tree_time();
+#endif //TRI_COLLISION_PROFILING
+
 }
 

Extras/GIMPACT/src/Bullet/btGImpactCollisionAlgorithm.cpp

@@ -63,6 +63,7 @@ public:
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////
+#ifdef TRI_COLLISION_PROFILING
 
 btClock g_triangle_clock;
 
@@ -79,7 +80,7 @@ void bt_end_gim02_tri_time()
 	g_accum_triangle_collision_time += g_triangle_clock.getTimeMicroseconds();
 	g_count_triangle_collision++;
 }
-
+#endif //TRI_COLLISION_PROFILING
 //! Retrieving shapes shapes
 /*!
 Declared here due of insuficent space on Pool allocators
@@ -163,6 +164,7 @@ public:
 //!@}
 
 
+#ifdef TRI_COLLISION_PROFILING
 
 //! Gets the average time in miliseconds of tree collisions
 float btGImpactCollisionAlgorithm::getAverageTreeCollisionTime()
@@ -185,6 +187,7 @@ float btGImpactCollisionAlgorithm::getAverageTriangleCollisionTime()
 	return avgtime;
 }
 
+#endif //TRI_COLLISION_PROFILING
 
 
 

Extras/GIMPACT/src/Bullet/btGImpactQuantizedBvh.cpp

@@ -24,6 +24,7 @@ subject to the following restrictions:
 #include "GIMPACT/Bullet/btGImpactQuantizedBvh.h"
 #include "LinearMath/btQuickprof.h"
 
+#ifdef TRI_COLLISION_PROFILING
 btClock g_q_tree_clock;
 
 
@@ -61,6 +62,7 @@ float btGImpactQuantizedBvh::getAverageTreeCollisionTime()
 
 }
 
+#endif //TRI_COLLISION_PROFILING
 
 /////////////////////// btQuantizedBvhTree /////////////////////////////////
 
@@ -511,13 +513,17 @@ void btGImpactQuantizedBvh::find_collision(btGImpactQuantizedBvh * boxset0, cons
 
 	trans_cache_1to0.calc_from_homogenic(trans0,trans1);
 
+#ifdef TRI_COLLISION_PROFILING
 	bt_begin_gim02_q_tree_time();
+#endif //TRI_COLLISION_PROFILING
 
 	_find_quantized_collision_pairs_recursive(
 		boxset0,boxset1,
 		&collision_pairs,trans_cache_1to0,0,0,true);
-
+#ifdef TRI_COLLISION_PROFILING
 	bt_end_gim02_q_tree_time();
+#endif //TRI_COLLISION_PROFILING
+
 }
 
 

Extras/LibXML/CMakeLists.txt

@@ -4,6 +4,9 @@ INCLUDE_DIRECTORIES(
 	
 # Prevent MSVC from moaning
 ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS)
+ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE)
+
+
 	
 ADD_LIBRARY(LibXML
 			c14n.c
@@ -27,8 +30,6 @@ ADD_LIBRARY(LibXML
 			parserInternals.c
 			pattern.c
 			relaxng.c
-			runsuite.c
-			runtest.c
 			SAX.c
 			SAX2.c
 			schematron.c
@@ -41,9 +42,7 @@ ADD_LIBRARY(LibXML
 			valid.c
 			xinclude.c
 			xlink.c
-			xmlcatalog.c
 			xmlIO.c
-			xmllint.c
 			xmlmemory.c
 			xmlmodule.c
 			xmlreader.c