Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some fixes in build systems

Browse Source
This commit is contained in:
erwin.coumans
2009-05-22 19:24:20 +00:00
parent bc1662abee
commit 4ad21d36f9
7 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
if (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld
CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo Raytracer
RagdollDemo ForkLiftDemo BasicDemo Box2dDemo Gpu2dDemo BspDemo MovingConcaveDemo VehicleDemo
RagdollDemo ForkLiftDemo BasicDemo Box2dDemo Gpu2dDemo Gpu3dDemo MiniCL_VectorAdd BspDemo MovingConcaveDemo VehicleDemo
ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo HeightFieldFluidDemo
CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo
DoublePrecisionDemo ConcaveDemo CollisionDemo
@@ -10,7 +10,7 @@ MultiMaterialDemo)
else (CMAKE_SIZEOF_VOID_P MATCHES "8")
SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld
MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo Raytracer
GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo Box2dDemo Gpu2dDemo BspDemo MovingConcaveDemo
GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo Box2dDemo Gpu2dDemo Gpu3dDemo MiniCL_VectorAdd BspDemo MovingConcaveDemo
VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo
HeightFieldFluidDemo
CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo

2
Demos/Gpu3dDemo/BasicDemo3d.cpp
View File

@@ -196,7 +196,7 @@ void BasicDemo3D::initPhysics()
///use the default collision dispatcher. For parallel processing you can use a diffent dispatcher (see Extras/BulletMultiThreaded)
//m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
#ifdef SINGLE_THREADED_NARROWPHASE
#ifndef WIN32
m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
#else
unsigned int maxNumOutstandingTasks =4;

3
Demos/Gpu3dDemo/Jamfile Normal file
View File

@@ -0,0 +1,3 @@
SubDir TOP Demos Gpu3dDemo ;
BulletDemo Gpu3dDemo : [ Wildcard *.h *.cpp ] ;

14
Demos/Jamfile
View File

@@ -44,6 +44,18 @@ rule BulletSoftBodyDemo
"../../src" ;
}
rule BulletMiniCLDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletmultithreaded bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/src ]
;
MsvcIncDirs $(<) :
"../../src" ;
}
if $(GLUT.AVAILABLE) = "yes"
{
# All demo apps have a lot in common, so use this rule to simply things
@@ -79,10 +91,12 @@ SubInclude TOP Demos ForkLiftDemo ;
SubInclude TOP Demos BulletDinoDemo ;
SubInclude TOP Demos EPAPenDepthDemo ;
SubInclude TOP Demos HelloWorld ;
SubInclude TOP Demos MiniCL_VectorAdd ;
SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos BasicDemo ;
SubInclude TOP Demos Box2dDemo ;
SubInclude TOP Demos Gpu2dDemo ;
SubInclude TOP Demos Gpu3dDemo ;
SubInclude TOP Demos ConvexDecompositionDemo ;
SubInclude TOP Demos ColladaDemo ;
SubInclude TOP Demos CharacterDemo ;

5
Demos/MiniCL_VectorAdd/Jamfile Normal file
View File

@@ -0,0 +1,5 @@
SubDir TOP Demos MiniCL_VectorAdd ;
BulletMiniCLDemo MiniCL_VectorAdd : [ Wildcard *.h *.cpp ] ;
MsvcIncDirs MiniCL_VectorAdd : "../../src" ;

19
src/BulletMultiThreaded/CMakeLists.txt
View File

@@ -66,6 +66,25 @@ ADD_LIBRARY(BulletMultiThreaded
SpuRaycastTask/SpuRaycastTask.h
SpuRaycastTask/SpuSubSimplexConvexCast.cpp
SpuRaycastTask/SpuSubSimplexConvexCast.h
#Some GPU related stuff, mainly CUDA and perhaps OpenCL
btGpu3DGridBroadphase.cpp
btGpu3DGridBroadphase.h
btGpu3DGridBroadphaseSharedCode.h
btGpu3DGridBroadphaseSharedDefs.h
btGpu3DGridBroadphaseSharedTypes.h
btGpuDefines.h
btGpuUtilsSharedCode.h
btGpuUtilsSharedDefs.h
#MiniCL provides a small subset of OpenCL
MiniCLTaskScheduler.cpp
MiniCLTaskScheduler.h
MiniCLTask/MiniCLTask.cpp
MiniCLTask/MiniCLTask.h
../MiniCL/cl.h
../MiniCL/cl_gl.h
../MiniCL/cl_platform.h
)
IF (BUILD_SHARED_LIBS)

2
src/BulletMultiThreaded/Jamfile
View File

@@ -2,7 +2,7 @@ SubDir TOP src BulletMultiThreaded ;
#IncludeDir src/BulletMultiThreaded ;
Library bulletmultithreaded : [ Wildcard . : *.h *.cpp ] [ Wildcard SpuNarrowPhaseCollisionTask : *.h *.cpp ] [ Wildcard SpuSolverTask : *.h *.cpp ] : noinstall ;
Library bulletmultithreaded : [ Wildcard . : *.h *.cpp ] [ Wildcard MiniCLTask : *.h *.cpp ] [ Wildcard SpuNarrowPhaseCollisionTask : *.h *.cpp ] [ Wildcard SpuSolverTask : *.h *.cpp ] : noinstall ;
CFlags bulletmultithreaded : [ FIncludes $(TOP)/src/BulletMultiThreaded ] [ FIncludes $(TOP)/src/BulletMultiThreaded/vectormath/scalar/cpp ] ;
LibDepends bulletmultithreaded : ;