From 98fa2a38e87411739fcb067de22e703b02f09a8f Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sat, 11 Nov 2006 06:40:55 +0000
Subject: [PATCH] updated some jamfiles, for Extra folder

---
 Demos/EPAPenDepthDemo/Jamfile                   |  2 +-
 Demos/EPAPenDepthDemo/PenetrationTestBullet.cpp |  4 ++--
 Demos/Jamfile                                   |  3 ++-
 Extras/EPA/Jamfile                              | 10 ++++++++++
 Extras/ExtraSolid35/Jamfile                     | 10 ++++++++++
 Extras/Jamfile                                  |  3 +++
 Extras/quickstep/Jamfile                        | 10 ++++++++++
 7 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 Extras/EPA/Jamfile
 create mode 100644 Extras/ExtraSolid35/Jamfile
 create mode 100644 Extras/quickstep/Jamfile

diff --git a/Demos/EPAPenDepthDemo/Jamfile b/Demos/EPAPenDepthDemo/Jamfile
index a25d75c13..56d574e4d 100644
--- a/Demos/EPAPenDepthDemo/Jamfile
+++ b/Demos/EPAPenDepthDemo/Jamfile
@@ -1,3 +1,3 @@
 SubDir TOP Demos EPAPenDepthDemo ;
 
-BulletDemo EPAPenDepthDemo : [ Wildcard *.h *.cpp  ] ;
+ExtraDemo EPAPenDepthDemo : [ Wildcard *.h *.cpp ../../Extras/ExtraSolid35/*.cpp ../../Extras/EPA/*.cpp  ] ;
diff --git a/Demos/EPAPenDepthDemo/PenetrationTestBullet.cpp b/Demos/EPAPenDepthDemo/PenetrationTestBullet.cpp
index 61dce272a..5c9d8e7c9 100644
--- a/Demos/EPAPenDepthDemo/PenetrationTestBullet.cpp
+++ b/Demos/EPAPenDepthDemo/PenetrationTestBullet.cpp
@@ -233,8 +233,8 @@ static float gDepth;
 
 static bool TestEPA(const MyConvex& hull0, const MyConvex& hull1)
 {
-	static btSimplexSolverInterface simplexSolver;
-	//static Solid3JohnsonSimplexSolver simplexSolver;
+	//static btSimplexSolverInterface simplexSolver;
+	static Solid3JohnsonSimplexSolver simplexSolver;
 
 	simplexSolver.reset();
 
diff --git a/Demos/Jamfile b/Demos/Jamfile
index 1d25f15ca..3209a13c5 100644
--- a/Demos/Jamfile
+++ b/Demos/Jamfile
@@ -21,7 +21,7 @@ if $(GLUT.AVAILABLE) = "yes"
   rule ExtraDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :   colladadom libxml bulletopenglsupport convexdecomposition bulletdynamics bulletcollision  bulletmath ;
+    LinkWith $(<) :   quickstep EPA ExtraSolid35 colladadom libxml bulletopenglsupport convexdecomposition bulletdynamics bulletcollision  bulletmath ;
     CFlags $(<) :
           [ FIncludes $(TOP)/Demos/OpenGL ]
        	  			[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
@@ -68,6 +68,7 @@ SubInclude TOP Demos CcdPhysicsDemo ;
 SubInclude TOP Demos UserCollisionAlgorithm ;
 #SubInclude TOP Demos ForkLiftDemo ;
 SubInclude TOP Demos BulletDinoDemo ;
+SubInclude TOP Demos EPAPenDepthDemo ;
 SubInclude TOP Demos BspDemo ;
 SubInclude TOP Demos BasicDemo ;
 SubInclude TOP Demos ConvexDecompositionDemo ;
diff --git a/Extras/EPA/Jamfile b/Extras/EPA/Jamfile
new file mode 100644
index 000000000..fa92e2f66
--- /dev/null
+++ b/Extras/EPA/Jamfile
@@ -0,0 +1,10 @@
+SubDir TOP Extras EPA ;
+
+IncludeDir Extras/EPA ;
+
+Library EPA : [ Wildcard *.h *.cpp ] ;
+CFlags EPA : [ FIncludes $(TOP)/Extras/EPA ] ;
+LibDepends EPA :  ;
+
+
+InstallHeader [ Wildcard *.h ] : EPA ;
diff --git a/Extras/ExtraSolid35/Jamfile b/Extras/ExtraSolid35/Jamfile
new file mode 100644
index 000000000..eb54236d2
--- /dev/null
+++ b/Extras/ExtraSolid35/Jamfile
@@ -0,0 +1,10 @@
+SubDir TOP Extras ExtraSolid35 ;
+
+IncludeDir Extras/ExtraSolid35 ;
+
+Library ExtraSolid35 : [ Wildcard *.h *.cpp ] ;
+CFlags ExtraSolid35 : [ FIncludes $(TOP)/Extras/ExtraSolid35 ] ;
+LibDepends ExtraSolid35 :  ;
+
+
+InstallHeader [ Wildcard *.h ] : ExtraSolid35 ;
diff --git a/Extras/Jamfile b/Extras/Jamfile
index 80c828043..cc0a2d24d 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -3,4 +3,7 @@ SubDir TOP Extras ;
 SubInclude TOP Extras ConvexDecomposition ;
 SubInclude TOP Extras COLLADA_DOM ;
 SubInclude TOP Extras LibXML ;
+SubInclude TOP Extras EPA ;
+SubInclude TOP Extras ExtraSolid35 ;
+SubInclude TOP Extras quickstep ;
 #SubInclude TOP Extras GPUphysics ;
diff --git a/Extras/quickstep/Jamfile b/Extras/quickstep/Jamfile
new file mode 100644
index 000000000..96022ea7a
--- /dev/null
+++ b/Extras/quickstep/Jamfile
@@ -0,0 +1,10 @@
+SubDir TOP Extras quickstep ;
+
+IncludeDir Extras/quickstep ;
+
+Library quickstep : [ Wildcard *.h *.cpp ] ;
+CFlags quickstep : [ FIncludes $(TOP)/Extras/quickstep ] ;
+LibDepends quickstep :  ;
+
+
+InstallHeader [ Wildcard *.h ] : quickstep ;