diff --git a/Demos/GimpactTestDemo/GimpactTestDemo.cpp b/Demos/GimpactTestDemo/GimpactTestDemo.cpp index b64af1a79..b8520911b 100644 --- a/Demos/GimpactTestDemo/GimpactTestDemo.cpp +++ b/Demos/GimpactTestDemo/GimpactTestDemo.cpp @@ -325,7 +325,7 @@ void GimpactConcaveDemo::initPhysics() //btOverlappingPairCache* broadphase = new btSimpleBroadphase(); //m_broadphase = new btSimpleBroadphase(); - LONG maxProxies = 1024; + int maxProxies = 1024; btVector3 worldAabbMin(-10000,-10000,-10000); btVector3 worldAabbMax( 10000, 10000, 10000); m_broadphase = new bt32BitAxisSweep3(worldAabbMin,worldAabbMax,maxProxies); diff --git a/Demos/GimpactTestDemo/Jamfile b/Demos/GimpactTestDemo/Jamfile new file mode 100644 index 000000000..5917391de --- /dev/null +++ b/Demos/GimpactTestDemo/Jamfile @@ -0,0 +1,21 @@ +SubDir TOP Demos GimpactTestDemo ; + + #some demos need extra functionality, Collada / ConvexDecomposition etc. + + rule ExtraDemo1 + + { + Application $(<) : $(>) : noinstall console nomanifest ; + LinkWith $(<) : GIMPACT bulletopenglsupport bulletdynamics bulletcollision bulletmath ; + CFlags $(<) : + [ FIncludes $(TOP)/Demos/OpenGL ] + [ FIncludes $(TOP)/Extras/GIMPACT/include ] + + ; + + MsvcIncDirs $(<) : + "../../Demos/OpenGL" + "../../Extras/GIMPACT/include" ; + } + +ExtraDemo1 GimpactTestDemo : [ Wildcard *.h *.cpp ] ; diff --git a/Demos/Jamfile b/Demos/Jamfile index 44ba82076..02e984465 100644 --- a/Demos/Jamfile +++ b/Demos/Jamfile @@ -43,6 +43,7 @@ SubInclude TOP Demos BspDemo ; SubInclude TOP Demos VehicleDemo ; SubInclude TOP Demos CollisionDemo ; SubInclude TOP Demos CollisionInterfaceDemo ; +SubInclude TOP Demos GimpactTestDemo ; SubInclude TOP Demos MovingConcaveDemo ; SubInclude TOP Demos ConcaveDemo ; SubInclude TOP Demos ConstraintDemo ;