updated Jam buildsystem to link properly under systems that rely on strict ordering of the link libraries

This commit is contained in:
ejcoumans
2006-10-05 14:05:09 +00:00
parent 3d589a7544
commit 97b287a6bc
5 changed files with 15 additions and 6 deletions

View File

@@ -8,7 +8,7 @@ if $(GLUT.AVAILABLE) = "yes"
rule BulletDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
;
@@ -21,7 +21,7 @@ if $(GLUT.AVAILABLE) = "yes"
rule ExtraDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : colladadom libxml convexdecomposition bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
LinkWith $(<) : colladadom libxml bulletopenglsupport convexdecomposition bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/ConvexDecomposition ]

View File

@@ -10,9 +10,13 @@ IncludeDir Extras/PhysicsInterface/CcdPhysics ;
Library bulletopenglsupport :
[ Wildcard *.h *.cpp ] : noinstall
;
CFlags bulletopenglsupport :
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
;
LibDepends bulletopenglsupport : bulletdynamics ;
ExternalLibs bulletopenglsupport : GLUT ;
}

View File

@@ -3,4 +3,4 @@ SubDir TOP Extras ;
SubInclude TOP Extras ConvexDecomposition ;
SubInclude TOP Extras COLLADA_DOM ;
SubInclude TOP Extras LibXML ;
SubInclude TOP Extras GPUphysics ;
#SubInclude TOP Extras GPUphysics ;

View File

@@ -8,4 +8,6 @@ Library bulletcollision :
[ Wildcard CollisionShapes : *.h *.cpp ]
[ Wildcard NarrowPhaseCollision : *.h *.cpp ]
;
LibDepends bulletcollision : bulletmath ;
Recurse InstallHeader : .h ;

View File

@@ -6,4 +6,7 @@ Library bulletdynamics :
[ Wildcard Dynamics : *.h *.cpp ]
[ Wildcard Vehicle : *.h *.cpp ]
;
LibDepends bulletdynamics : bulletcollision ;
Recurse InstallHeader : .h ;