updated Jamfile build system for reorganized files/folders

src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp

@@ -15,6 +15,16 @@ subject to the following restrictions:
 
 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
 
+btPolyhedralConvexShape::btPolyhedralConvexShape() :btConvexInternalShape(),
+m_localAabbMin(1,1,1),
+m_localAabbMax(-1,-1,-1),
+m_isLocalAabbValid(false),
+m_optionalHull(0)
+{
+
+}
+
+
 btVector3	btPolyhedralConvexShape::localGetSupportingVertexWithoutMargin(const btVector3& vec0)const
 {
 	int i;

src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h

@@ -31,17 +31,9 @@ protected:
 	btVector3	m_localAabbMax;
 	bool		m_isLocalAabbValid;
 
-	btPolyhedralConvexShape() :btConvexInternalShape(),
-m_localAabbMin(1,1,1),
-m_localAabbMax(-1,-1,-1),
-m_isLocalAabbValid(false),
-m_optionalHull(0)
-{
-
-}
 public:
 
-	
+	btPolyhedralConvexShape();
 
 	//brute force implementations
 

src/BulletCollision/Jamfile

@@ -3,6 +3,7 @@ SubDir TOP src BulletCollision ;
 
 Description bulletcollision : "Bullet Collision Detection" ;
 Library bulletcollision :
+  [ Wildcard Gimpact : *.h *.cpp ]
   [ Wildcard BroadphaseCollision : *.h *.cpp ] 
   [ Wildcard CollisionDispatch : *.h *.cpp ] 
   [ Wildcard CollisionShapes : *.h *.cpp ] 

src/BulletMultiThreaded/CMakeLists.txt

@@ -1,5 +1,4 @@
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletMultiThreaded/
 ${BULLET_PHYSICS_SOURCE_DIR}/src
 )
 

src/BulletMultiThreaded/Jamfile

@@ -1,12 +1,12 @@
-SubDir TOP Extras BulletMultiThreaded ;
+SubDir TOP src BulletMultiThreaded ;
 
-#IncludeDir Extras/BulletMultiThreaded ;
+#IncludeDir src/BulletMultiThreaded ;
 
 Library bulletmultithreaded : [ Wildcard . : */.h *.cpp ] [ Wildcard SpuNarrowPhaseCollisionTask : *.h *.cpp  ] [ Wildcard SpuSolverTask : *.h *.cpp  ] : noinstall ;
-CFlags bulletmultithreaded : [ FIncludes $(TOP)/Extras/BulletMultiThreaded ] ;
+CFlags bulletmultithreaded : [ FIncludes $(TOP)/src/BulletMultiThreaded ] ;
 LibDepends bulletmultithreaded :  ;
 
    MsvcIncDirs bulletmultithreaded : 
-	"../../Extras/BulletMultiThreaded"  ;
+	"../../src/BulletMultiThreaded"  ;
 
 InstallHeader [ Wildcard *.h ] : bulletmultithreaded ;

src/BulletMultiThreaded/PosixThreadSupport.h

@@ -111,6 +111,10 @@ public:
 ///tell the task scheduler we are done with the SPU tasks
 	virtual	void stopSPU();
 
+	virtual void setNumTasks(int numTasks)
+	{
+	}
+
 };
 
 #endif // POSIX_THREAD_SUPPORT_H

src/CMakeLists.txt

@@ -1 +1,7 @@
-SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath )
+if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+SUBDIRS( BulletSoftBody BulletCollision BulletDynamics Linea
+rMath )
+else (CMAKE_SIZEOF_VOID_P MATCHES "8")
+SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics Linea
+rMath )
+endif (CMAKE_SIZEOF_VOID_P MATCHES "8")

src/Jamfile

@@ -1,8 +1,7 @@
 SubDir TOP src ;
-
+SubInclude TOP src BulletMultiThreaded ;
 SubInclude TOP src BulletSoftBody ;
 SubInclude TOP src BulletCollision ;
 SubInclude TOP src BulletDynamics ;
 SubInclude TOP src LinearMath ;
-
 Recurse InstallHeader : .h  ;