moved FrameWork into Demos folder

Demos/BasicDemo/BasicDemo.cpp

@@ -39,7 +39,6 @@ int gNumObjects = 120;
 #include "GLDebugDrawer.h"
 #include <stdio.h> //printf debugging
 btScalar deltaTime = btScalar(1./60.);
-btScalar gCollisionMargin = btScalar(0.05);
 #include "BasicDemo.h"
 #include "GL_ShapeDrawer.h"
 #include "GlutStuff.h"

Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp

@@ -71,7 +71,7 @@ subject to the following restrictions:
 #include "BMF_Api.h"
 #include <stdio.h> //printf debugging
 
-float	gCollisionMargin = 0.05f;
+static float	gCollisionMargin = 0.05f;
 #include "CcdPhysicsDemo.h"
 #include "GL_ShapeDrawer.h"
 

Demos/Jamfile

@@ -29,7 +29,27 @@ if $(GLUT.AVAILABLE) = "yes"
         "../../src" ;
   }
 
+if $(GLUT.AVAILABLE) = "yes"
+{
+  # All demo apps have a lot in common, so use this rule to simply things
+  rule FrameWorkDemo
+  {
+    Application $(<) : $(>) : noinstall console nomanifest ;
+    LinkWith $(<) :   bulletopenglsupport bulletdynamics bulletcollision bulletmath glui ;
+    CFlags $(<) :
+          [ FIncludes $(TOP)/Extras ]
+         [ FIncludes $(TOP)/Demos/OpenGL ]
+    ;
+    MsvcIncDirs $(<) :
+        "../../Extras"
+        "../../src"
+        "../../Demos/OpenGL"
+;
 
+  }
+}
+
+SubInclude TOP Demos AllBulletDemos ;
 SubInclude TOP Demos CcdPhysicsDemo ;
 SubInclude TOP Demos UserCollisionAlgorithm ;
 #SubInclude TOP Demos ForkLiftDemo ;