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

fix autotools build, add MLCPSolvers and ForkLiftDemo

Browse Source
This commit is contained in:
erwin.coumans@gmail.com
2013-10-24 02:27:37 +00:00
parent f5320e4106
commit 5ca137cb54
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Demos/ForkLiftDemo/Makefile.am Normal file
View File

@@ -0,0 +1,5 @@
noinst_PROGRAMS=ForkLiftDemo
ForkLiftDemo_SOURCES=ForkLiftDemo.cpp ForkLiftDemo.h main.cpp
ForkLiftDemo_CXXFLAGS=-I@top_builddir@/src -I@top_builddir@/Demos/OpenGL $(CXXFLAGS)
ForkLiftDemo_LDADD=-L../OpenGL -lbulletopenglsupport -L../../src -lBulletDynamics -lBulletCollision -lLinearMath @opengl_LIBS@

4
Demos/Makefile.am
View File

@@ -1,5 +1,5 @@
if CONDITIONAL_BUILD_MULTITHREADED if CONDITIONAL_BUILD_MULTITHREADED
SUBDIRS=OpenGL BasicDemo FeatherstoneMultiBodyDemo TerrainDemo VehicleDemo CcdPhysicsDemo MultiThreadedDemo SoftDemo AllBulletDemos SUBDIRS=OpenGL BasicDemo ForkLiftDemo FeatherstoneMultiBodyDemo TerrainDemo VehicleDemo CcdPhysicsDemo MultiThreadedDemo SoftDemo AllBulletDemos
else else
SUBDIRS=OpenGL BasicDemo FeatherstoneMultiBodyDemo TerrainDemo VehicleDemo CcdPhysicsDemo SoftDemo AllBulletDemos SUBDIRS=OpenGL BasicDemo ForkLiftDemo FeatherstoneMultiBodyDemo TerrainDemo VehicleDemo CcdPhysicsDemo SoftDemo AllBulletDemos
endif endif

2
configure.ac
View File

@@ -163,7 +163,7 @@ CXXFLAGS="$ARCH_SPECIFIC_CFLAGS $CXXFLAGS $CFLAGS"
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Emit generated files. # Emit generated files.
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
AC_CONFIG_FILES([bullet.pc Makefile Demos/Makefile Demos/SoftDemo/Makefile Demos/AllBulletDemos/Makefile Demos/MultiThreadedDemo/Makefile Demos/OpenGL/Makefile Demos/BasicDemo/Makefile Demos/CcdPhysicsDemo/Makefile Demos/VehicleDemo/Makefile Demos/TerrainDemo/Makefile src/Makefile Extras/Makefile]) AC_CONFIG_FILES([bullet.pc Makefile Demos/Makefile Demos/SoftDemo/Makefile Demos/AllBulletDemos/Makefile Demos/MultiThreadedDemo/Makefile Demos/OpenGL/Makefile Demos/ForkLiftDemo/Makefile Demos/FeatherstoneMultiBodyDemo/Makefile Demos/BasicDemo/Makefile Demos/CcdPhysicsDemo/Makefile Demos/VehicleDemo/Makefile Demos/TerrainDemo/Makefile src/Makefile Extras/Makefile])
AC_OUTPUT AC_OUTPUT
AC_MSG_NOTICE([ AC_MSG_NOTICE([

24
src/Makefile.am
View File

@@ -362,9 +362,13 @@ libBulletDynamics_la_SOURCES = \
BulletDynamics/Vehicle/btVehicleRaycaster.h \ BulletDynamics/Vehicle/btVehicleRaycaster.h \
BulletDynamics/Vehicle/btRaycastVehicle.h \ BulletDynamics/Vehicle/btRaycastVehicle.h \
BulletDynamics/Vehicle/btWheelInfo.h \ BulletDynamics/Vehicle/btWheelInfo.h \
BulletDynamics/Featherstone/btMultiBody.cpp BulletDynamics/Featherstone/btMultiBody.cpp \
BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp \ BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp \
BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp \ BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp \
BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp \
BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp \
BulletDynamics/Featherstone/btMultiBodyJointMotor.h \
BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h \
BulletDynamics/Featherstone/btMultiBody.h \ BulletDynamics/Featherstone/btMultiBody.h \
BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h \ BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h \
BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h \ BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h \
@@ -374,7 +378,17 @@ libBulletDynamics_la_SOURCES = \
BulletDynamics/Featherstone/btMultiBodyConstraint.h \ BulletDynamics/Featherstone/btMultiBodyConstraint.h \
BulletDynamics/Featherstone/btMultiBodyPoint2Point.h \ BulletDynamics/Featherstone/btMultiBodyPoint2Point.h \
BulletDynamics/Featherstone/btMultiBodyConstraint.cpp \ BulletDynamics/Featherstone/btMultiBodyConstraint.cpp \
BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp \
BulletDynamics/MLCPSolvers/btDantzigLCP.cpp \
BulletDynamics/MLCPSolvers/btMLCPSolver.cpp \
BulletDynamics/MLCPSolvers/btDantzigLCP.h \
BulletDynamics/MLCPSolvers/btDantzigSolver.h \
BulletDynamics/MLCPSolvers/btMLCPSolver.h \
BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h \
BulletDynamics/MLCPSolvers/btPATHSolver.h \
BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h
libBulletSoftBody_la_SOURCES = \ libBulletSoftBody_la_SOURCES = \
@@ -444,6 +458,12 @@ nobase_bullet_include_HEADERS += \
BulletDynamics/Featherstone/btMultiBodySolverConstraint.h \ BulletDynamics/Featherstone/btMultiBodySolverConstraint.h \
BulletDynamics/Featherstone/btMultiBodyConstraint.h \ BulletDynamics/Featherstone/btMultiBodyConstraint.h \
BulletDynamics/Featherstone/btMultiBodyPoint2Point.h \ BulletDynamics/Featherstone/btMultiBodyPoint2Point.h \
BulletDynamics/MLCPSolvers/btDantzigLCP.h \
BulletDynamics/MLCPSolvers/btDantzigSolver.h \
BulletDynamics/MLCPSolvers/btMLCPSolver.h \
BulletDynamics/MLCPSolvers/btMLCPSolverInterface.h \
BulletDynamics/MLCPSolvers/btPATHSolver.h \
BulletDynamics/MLCPSolvers/btSolveProjectedGaussSeidel.h \
BulletCollision/CollisionShapes/btShapeHull.h \ BulletCollision/CollisionShapes/btShapeHull.h \
BulletCollision/CollisionShapes/btConcaveShape.h \ BulletCollision/CollisionShapes/btConcaveShape.h \
BulletCollision/CollisionShapes/btCollisionMargin.h \ BulletCollision/CollisionShapes/btCollisionMargin.h \