disable CProfileManager, might reduce some multi-threading conflicts

examples/Collision/CollisionTutorialBullet2.cpp

@@ -265,8 +265,9 @@ public:
 	
     virtual void	stepSimulation(float deltaTime)
     {
+#ifndef BT_NO_PROFILE
 		CProfileManager::Reset();
-		
+#endif
 		
 		
 		
@@ -314,7 +315,9 @@ public:
 	
 	
 		 m_app->m_renderer->writeTransforms();
+#ifndef BT_NO_PROFILE
 		 CProfileManager::Increment_Frame_Counter();
+#endif
     }
     virtual void	renderScene()
     {

examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp

@@ -4,7 +4,7 @@
 #include "LinearMath/btQuickprof.h"
 
 
-
+#ifndef BT_NO_PROFILE  
 
 
 class MyProfileWindow : public Gwen::Controls::WindowControl
@@ -44,6 +44,7 @@ public:
 	
 	
 	CProfileIterator* profIter;
+	
 	class MyMenuItems* m_menuItems;
 	MyProfileWindow (	Gwen::Controls::Base* pParent)
     : Gwen::Controls::WindowControl( pParent ),
@@ -304,3 +305,5 @@ void destroyProfileWindow(MyProfileWindow* window)
 	CProfileManager::Release_Iterator(window->profIter);
 	delete window;
 }
+
+#endif //BT_NO_PROFILE

src/LinearMath/btQuickprof.cpp

@@ -15,11 +15,8 @@
 
 #include "btQuickprof.h"
 
-#ifndef BT_NO_PROFILE
 
 
-static btClock gProfileClock;
-
 
 #ifdef __CELLOS_LV2__
 #include <sys/sys_time.h>
@@ -250,6 +247,10 @@ btScalar btClock::getTimeSeconds()
 	return btScalar(getTimeMicroseconds()) * microseconds_to_seconds;
 }
 
+#ifndef BT_NO_PROFILE
+
+
+static btClock gProfileClock;
 
 
 inline void Profile_Get_Ticks(unsigned long int * ticks)
@@ -265,7 +266,6 @@ inline float Profile_Get_Tick_Rate(void)
 }
 
 
-
 /***************************************************************************************************
 **
 ** CProfileNode

src/LinearMath/btQuickprof.h

@@ -15,18 +15,7 @@
 #ifndef BT_QUICK_PROF_H
 #define BT_QUICK_PROF_H
 
-//To disable built-in profiling, please comment out next line
-//#define BT_NO_PROFILE 1
-#ifndef BT_NO_PROFILE
-#include <stdio.h>//@todo remove this, backwards compatibility
 #include "btScalar.h"
-#include "btAlignedAllocator.h"
-#include <new>
-
-
-
-
-
 #define USE_BT_CLOCK 1
 
 #ifdef USE_BT_CLOCK
@@ -64,6 +53,20 @@ private:
 #endif //USE_BT_CLOCK
 
 
+//To disable built-in profiling, please comment out next line
+#define BT_NO_PROFILE 1
+#ifndef BT_NO_PROFILE
+#include <stdio.h>//@todo remove this, backwards compatibility
+
+#include "btAlignedAllocator.h"
+#include <new>
+
+
+
+
+
+
+
 
 
 ///A node in the Profile Hierarchy Tree