updated Jam buildsystem to link properly under systems that rely on strict ordering of the link libraries
This commit is contained in:
@@ -8,7 +8,7 @@ if $(GLUT.AVAILABLE) = "yes"
|
|||||||
rule BulletDemo
|
rule BulletDemo
|
||||||
{
|
{
|
||||||
Application $(<) : $(>) : noinstall console nomanifest ;
|
Application $(<) : $(>) : noinstall console nomanifest ;
|
||||||
LinkWith $(<) : bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
|
LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
|
||||||
CFlags $(<) :
|
CFlags $(<) :
|
||||||
[ FIncludes $(TOP)/Demos/OpenGL ]
|
[ FIncludes $(TOP)/Demos/OpenGL ]
|
||||||
;
|
;
|
||||||
@@ -21,7 +21,7 @@ if $(GLUT.AVAILABLE) = "yes"
|
|||||||
rule ExtraDemo
|
rule ExtraDemo
|
||||||
{
|
{
|
||||||
Application $(<) : $(>) : noinstall console nomanifest ;
|
Application $(<) : $(>) : noinstall console nomanifest ;
|
||||||
LinkWith $(<) : colladadom libxml convexdecomposition bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
|
LinkWith $(<) : colladadom libxml bulletopenglsupport convexdecomposition bulletdynamics bulletcollision bulletmath ;
|
||||||
CFlags $(<) :
|
CFlags $(<) :
|
||||||
[ FIncludes $(TOP)/Demos/OpenGL ]
|
[ FIncludes $(TOP)/Demos/OpenGL ]
|
||||||
[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
|
[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
|
||||||
|
|||||||
@@ -10,9 +10,13 @@ IncludeDir Extras/PhysicsInterface/CcdPhysics ;
|
|||||||
Library bulletopenglsupport :
|
Library bulletopenglsupport :
|
||||||
[ Wildcard *.h *.cpp ] : noinstall
|
[ Wildcard *.h *.cpp ] : noinstall
|
||||||
;
|
;
|
||||||
|
|
||||||
CFlags bulletopenglsupport :
|
CFlags bulletopenglsupport :
|
||||||
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
|
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
|
||||||
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
|
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
|
||||||
;
|
;
|
||||||
|
|
||||||
|
LibDepends bulletopenglsupport : bulletdynamics ;
|
||||||
|
|
||||||
ExternalLibs bulletopenglsupport : GLUT ;
|
ExternalLibs bulletopenglsupport : GLUT ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,4 +3,4 @@ SubDir TOP Extras ;
|
|||||||
SubInclude TOP Extras ConvexDecomposition ;
|
SubInclude TOP Extras ConvexDecomposition ;
|
||||||
SubInclude TOP Extras COLLADA_DOM ;
|
SubInclude TOP Extras COLLADA_DOM ;
|
||||||
SubInclude TOP Extras LibXML ;
|
SubInclude TOP Extras LibXML ;
|
||||||
SubInclude TOP Extras GPUphysics ;
|
#SubInclude TOP Extras GPUphysics ;
|
||||||
|
|||||||
@@ -8,4 +8,6 @@ Library bulletcollision :
|
|||||||
[ Wildcard CollisionShapes : *.h *.cpp ]
|
[ Wildcard CollisionShapes : *.h *.cpp ]
|
||||||
[ Wildcard NarrowPhaseCollision : *.h *.cpp ]
|
[ Wildcard NarrowPhaseCollision : *.h *.cpp ]
|
||||||
;
|
;
|
||||||
|
LibDepends bulletcollision : bulletmath ;
|
||||||
|
|
||||||
Recurse InstallHeader : .h ;
|
Recurse InstallHeader : .h ;
|
||||||
|
|||||||
@@ -6,4 +6,7 @@ Library bulletdynamics :
|
|||||||
[ Wildcard Dynamics : *.h *.cpp ]
|
[ Wildcard Dynamics : *.h *.cpp ]
|
||||||
[ Wildcard Vehicle : *.h *.cpp ]
|
[ Wildcard Vehicle : *.h *.cpp ]
|
||||||
;
|
;
|
||||||
|
|
||||||
|
LibDepends bulletdynamics : bulletcollision ;
|
||||||
|
|
||||||
Recurse InstallHeader : .h ;
|
Recurse InstallHeader : .h ;
|
||||||
|
|||||||
Reference in New Issue
Block a user