From e56ac06fe248709b5de06d46dd7c01e439aefcd6 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Sun, 21 Oct 2007 04:59:55 +0000 Subject: [PATCH] added support for FrameWork demo running CcdPhysicsDemo,BasicDemo,BspDemo --- Examples/TestBed/Jamfile | 8 ++++++-- Examples/TestBed/Tests/Jamfile | 9 ++++++++- Examples/TestBed/Tests/TestEntries.cpp | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Examples/TestBed/Jamfile b/Examples/TestBed/Jamfile index 82034b83d..dd46945f5 100644 --- a/Examples/TestBed/Jamfile +++ b/Examples/TestBed/Jamfile @@ -6,13 +6,17 @@ if $(GLUT.AVAILABLE) = "yes" rule FrameWorkDemo { Application $(<) : $(>) : noinstall console nomanifest ; - LinkWith $(<) : Tests bulletdynamics bulletcollision bulletmath glui ; + LinkWith $(<) : Tests bulletopenglsupport bulletdynamics bulletcollision bulletmath glui ; CFlags $(<) : [ FIncludes $(TOP)/Extras ] + [ FIncludes $(TOP)/Demos/OpenGL ] ; MsvcIncDirs $(<) : "../../Extras" - "../../src" ; + "../../src" + "../../Demos/OpenGL" +; + } } diff --git a/Examples/TestBed/Tests/Jamfile b/Examples/TestBed/Tests/Jamfile index 9857de618..2484c6ba8 100644 --- a/Examples/TestBed/Tests/Jamfile +++ b/Examples/TestBed/Tests/Jamfile @@ -6,10 +6,17 @@ if $(GLUT.AVAILABLE) = "yes" Description Tests : "Bullet Tests" ; Library Tests : - [ Wildcard *.h *.cpp ] : noinstall + ../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp + ../../../Demos/BasicDemo/BasicDemo.cpp + ../../../Demos/BspDemo/BspDemo.cpp + ../../../Demos/BspDemo/BspConverter.cpp + ../../../Demos/BspDemo/BspLoader.cpp + [ Wildcard *.h *.cpp ] + : noinstall ; CFlags Tests : + [ FIncludes $(TOP)/Demos/OpenGL ] ; LibDepends Tests : bulletdynamics ; diff --git a/Examples/TestBed/Tests/TestEntries.cpp b/Examples/TestBed/Tests/TestEntries.cpp index 4b2c9f0f0..53bd792cf 100644 --- a/Examples/TestBed/Tests/TestEntries.cpp +++ b/Examples/TestBed/Tests/TestEntries.cpp @@ -3,7 +3,7 @@ #include "../FrameWork/Test.h" #include "CollisionProcessing.h" -#include "../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.h" +#include "../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.h" class CcdPhysicsTest : public Test { @@ -28,7 +28,7 @@ public: } }; -#include "../../Demos/BspDemo/BspDemo.h" +#include "../../../Demos/BspDemo/BspDemo.h" class BspDemoTest : public Test {