updated some jamfiles, for Extra folder
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
SubDir TOP Demos EPAPenDepthDemo ;
|
||||
|
||||
BulletDemo EPAPenDepthDemo : [ Wildcard *.h *.cpp ] ;
|
||||
ExtraDemo EPAPenDepthDemo : [ Wildcard *.h *.cpp ../../Extras/ExtraSolid35/*.cpp ../../Extras/EPA/*.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();
|
||||
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
Reference in New Issue
Block a user