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

update buildsystem for recent refactoring

Browse Source
This commit is contained in:
ejcoumans
2006-09-30 02:40:55 +00:00
parent 01a6290cf7
commit c9e468b127
5 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
SUBDIRS( OpenGL CcdPhysicsDemo BspDemo ColladaDemo VehicleDemo ForkLiftDemo UserCollisionAlgorithm ) SUBDIRS( OpenGL CcdPhysicsDemo BspDemo ColladaDemo UserCollisionAlgorithm )

4
Demos/CcdPhysicsDemo/CMakeLists.txt
View File

@@ -48,11 +48,11 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics } ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
) )
LINK_LIBRARIES( LINK_LIBRARIES(
LibOpenGLSupport LibCcdPhysicsInterface LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY} LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
) )
ADD_EXECUTABLE(CcdPhysicsDemo ADD_EXECUTABLE(CcdPhysicsDemo

31
Demos/Jamfile
View File

@@ -8,28 +8,23 @@ if $(GLUT.AVAILABLE) = "yes"
rule BulletDemo rule BulletDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletcollision bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ; LinkWith $(<) : bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
; ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Demos/OpenGL" "../../Demos/OpenGL"
"../../Extras/PhysicsInterface/CcdPhysics" "../../src" ;
"../../Extras/PhysicsInterface/Common" ;
} }
#some demos need extra functionality, Collada / ConvexDecomposition etc. #some demos need extra functionality, Collada / ConvexDecomposition etc.
rule ExtraDemo rule ExtraDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : collada-dom libxml convexdecomposition bulletcollision bulletopenglsupport bulletphysicsinterfacecommon bulletccdphysics bulletmath ; LinkWith $(<) : collada-dom libxml convexdecomposition bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ] [ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] [ FIncludes $(TOP)/Extras/ConvexDecomposition ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ] [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
[ FIncludes $(TOP)/Extras/LibXML ] [ FIncludes $(TOP)/Extras/LibXML ]
@@ -40,9 +35,7 @@ if $(GLUT.AVAILABLE) = "yes"
; ;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Demos/OpenGL" "../../Demos/OpenGL"
"../../Extras/PhysicsInterface/CcdPhysics" "../../Extras/ConvexDecomposition"
"../../Extras/PhysicsInterface/Common"
"../../Extras/ConvexDecomposition"
"../../Extras/COLLADA_DOM/include" "../../Extras/COLLADA_DOM/include"
"../../Extras/COLLADA_DOM/include/1.4" "../../Extras/COLLADA_DOM/include/1.4"
"../../Extras/LibXML" "../../Extras/LibXML"
@@ -62,24 +55,22 @@ else
rule BulletBasicDemo rule BulletBasicDemo
{ {
Application $(<) : $(>) : noinstall console nomanifest ; Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletcollision bulletphysicsinterfacecommon bulletccdphysics bulletmath ; LinkWith $(<) : bulletcollision bulletmath ;
CFlags $(<) : CFlags $(<) :
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] [ FIncludes $(TOP)/src ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ] ;
;
MsvcIncDirs $(<) : MsvcIncDirs $(<) :
"../../Extras/PhysicsInterface/CcdPhysics" "../../src" ;
"../../Extras/PhysicsInterface/Common" ;
} }
SubInclude TOP Demos CcdPhysicsDemo ; SubInclude TOP Demos CcdPhysicsDemo ;
SubInclude TOP Demos UserCollisionAlgorithm ; SubInclude TOP Demos UserCollisionAlgorithm ;
SubInclude TOP Demos ForkLiftDemo ; #SubInclude TOP Demos ForkLiftDemo ;
SubInclude TOP Demos BspDemo ; SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos ConvexDecompositionDemo ; SubInclude TOP Demos ConvexDecompositionDemo ;
SubInclude TOP Demos ColladaDemo ; SubInclude TOP Demos ColladaDemo ;
SubInclude TOP Demos BspDemo ; SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos VehicleDemo ; #SubInclude TOP Demos VehicleDemo ;
SubInclude TOP Demos CollisionDemo ; SubInclude TOP Demos CollisionDemo ;
SubInclude TOP Demos CollisionInterfaceDemo ; SubInclude TOP Demos CollisionInterfaceDemo ;
SubInclude TOP Demos ConcaveDemo ; SubInclude TOP Demos ConcaveDemo ;

2
Extras/CMakeLists.txt
View File

@@ -1 +1 @@
SUBDIRS( PhysicsInterface LibXML COLLADA_DOM ) SUBDIRS( LibXML COLLADA_DOM )

1
Extras/Jamfile
View File

@@ -1,6 +1,5 @@
SubDir TOP Extras ; SubDir TOP Extras ;
SubInclude TOP Extras PhysicsInterface ;
SubInclude TOP Extras ConvexDecomposition ; SubInclude TOP Extras ConvexDecomposition ;
SubInclude TOP Extras COLLADA_DOM ; SubInclude TOP Extras COLLADA_DOM ;
SubInclude TOP Extras LibXML ; SubInclude TOP Extras LibXML ;