From 5a0d8a947046510c9fc0f73764cc0a3f607bf900 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Wed, 14 Jan 2009 01:18:41 +0000 Subject: [PATCH] Demos folder is not in the include path, use relative path to access btDebugDrawer.h remove non-existent projects from CMakeLists.txt Thanks a lot to Paul Martz for the report and suggested fixes. http://bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=3069 --- Demos/CMakeLists.txt | 4 ++-- Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp | 2 +- Extras/iff/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt index e578a4b8b..cdf36bd9e 100644 --- a/Demos/CMakeLists.txt +++ b/Demos/CMakeLists.txt @@ -2,11 +2,11 @@ if (CMAKE_SIZEOF_VOID_P MATCHES "8") SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo -ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo TerrainDemo HeightFieldFluidDemo) +ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo HeightFieldFluidDemo) else (CMAKE_SIZEOF_VOID_P MATCHES "8") SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo -TerrainDemo HeightFieldFluidDemo) + HeightFieldFluidDemo) endif (CMAKE_SIZEOF_VOID_P MATCHES "8") diff --git a/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp b/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp index daebeab3b..092f0c16e 100644 --- a/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp +++ b/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp @@ -8,7 +8,7 @@ #include "BulletCollision/CollisionDispatch/btManifoldResult.h" #include "BulletCollision/CollisionShapes/btTriangleShape.h" #include "BulletDynamics/Dynamics/btRigidBody.h" -#include "Demos/OpenGL/GLDebugDrawer.h" +#include "../../OpenGL/GLDebugDrawer.h" btHfFluid::btHfFluid (btScalar gridCellWidth, int numNodesWidth, int numNodesLength) { diff --git a/Extras/iff/CMakeLists.txt b/Extras/iff/CMakeLists.txt index ddc476a93..17d798c42 100644 --- a/Extras/iff/CMakeLists.txt +++ b/Extras/iff/CMakeLists.txt @@ -8,4 +8,4 @@ iffr.cpp iffw.cpp ) -SUBDIRS( BulletIffConverter ) +#SUBDIRS( BulletIffConverter )