diff options
Diffstat (limited to 'extern/bullet/SConscript')
| -rw-r--r-- | extern/bullet/SConscript | 178 |
1 files changed, 87 insertions, 91 deletions
diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript index 453d18aff6d..bb58c0c840e 100644 --- a/extern/bullet/SConscript +++ b/extern/bullet/SConscript @@ -2,28 +2,24 @@ import sys import os -bullet_env = Environment(ENV = os.environ) +Import('env') -# Import the C flags set in the SConstruct file -Import ('cflags') -#Import ('cxxflags') -#Import ('defines') -Import ('user_options_dict') -#defines = ['QHULL', '_LIB'] -defines = ['USE_DOUBLES','QHULL', '_LIB'] -#cflags = [] -cxxflags = [] +defs = 'USE_DOUBLES QHULL _LIB' +cflags = [] -if sys.platform=='win32': - defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB'] - #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] - cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6'] +if env['OURPLATFORM']=='win32-vc': + defs += ' WIN32 NDEBUG _WINDOWS _LIB' + #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] + cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6'] +if env['OURPLATFORM']=='win32-mingw': + defs += ' NDEBUG' + cflags += ['-O2'] elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5': - defines += ['NDEBUG'] - cflags += ['-O2'] -elif sys.platform=='darwin' : - defines += ['NDEBUG'] - cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] + defs += ' NDEBUG' + cflags += ['-O2'] +elif sys.platform=='darwin': + defs += ' NDEBUG' + cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] else: print "################################################" @@ -33,79 +29,79 @@ else: print "and cflags / cxxflags to the" print "extern/bullet/SConscript file" -bullet_env.Append (CCFLAGS = cflags) -bullet_env.Append (CPPFLAGS = cxxflags) +#bullet_env.Append (CCFLAGS = cflags) +#bullet_env.Append (CPPFLAGS = cxxflags) -bullet_env.Append (CPPDEFINES = defines) +#bullet_env.Append (CPPDEFINES = defines) -bullet_sources = ['Bullet/BroadphaseCollision/BroadphaseProxy.cpp', - 'Bullet/BroadphaseCollision/CollisionAlgorithm.cpp', - 'Bullet/BroadphaseCollision/CollisionDispatcher.cpp', - 'Bullet/BroadphaseCollision/SimpleBroadphase.cpp', - - 'Bullet/CollisionShapes/BoxShape.cpp', - 'Bullet/CollisionShapes/CollisionShape.cpp', - 'Bullet/CollisionShapes/ConeShape.cpp', - 'Bullet/CollisionShapes/ConvexHullShape.cpp', - 'Bullet/CollisionShapes/ConvexShape.cpp', - 'Bullet/CollisionShapes/CylinderShape.cpp', - 'Bullet/CollisionShapes/MinkowskiSumShape.cpp', - 'Bullet/CollisionShapes/MultiSphereShape.cpp', - 'Bullet/CollisionShapes/PolyhedralConvexShape.cpp', - 'Bullet/CollisionShapes/Simplex1to4Shape.cpp', - 'Bullet/CollisionShapes/SphereShape.cpp', - 'Bullet/CollisionShapes/StridingMeshInterface.cpp', - 'Bullet/CollisionShapes/TriangleMesh.cpp', - 'Bullet/CollisionShapes/TriangleMeshShape.cpp', - 'Bullet/CollisionShapes/BvhTriangleMeshShape.cpp', - 'Bullet/CollisionShapes/ConvexTriangleCallback.cpp', - 'Bullet/CollisionShapes/EmptyShape.cpp', - 'Bullet/CollisionShapes/OptimizedBvh.cpp', - 'Bullet/CollisionShapes/TriangleCallback.cpp', - 'Bullet/CollisionShapes/TriangleIndexVertexArray.cpp', - - 'Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.cpp', - 'Bullet/NarrowPhaseCollision/BU_Collidable.cpp', - 'Bullet/NarrowPhaseCollision/BU_CollisionPair.cpp', - 'Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp', - 'Bullet/NarrowPhaseCollision/BU_Screwing.cpp', - 'Bullet/NarrowPhaseCollision/BU_VertexPoly.cpp', - 'Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp', - 'Bullet/NarrowPhaseCollision/ConvexCast.cpp', - 'Bullet/NarrowPhaseCollision/GjkConvexCast.cpp', - 'Bullet/NarrowPhaseCollision/GjkPairDetector.cpp', - 'Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp', - 'Bullet/NarrowPhaseCollision/PersistentManifold.cpp', - 'Bullet/NarrowPhaseCollision/RaycastCallback.cpp', - 'Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp', - 'Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp', - 'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp', - - 'BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp', - 'BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp', - 'BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp', - 'BulletDynamics/CollisionDispatch/ManifoldResult.cpp', - 'BulletDynamics/CollisionDispatch/ToiContactDispatcher.cpp', - 'BulletDynamics/CollisionDispatch/UnionFind.cpp', - - 'BulletDynamics/ConstraintSolver/ContactConstraint.cpp', - 'BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp', - #'BulletDynamics/ConstraintSolver/OdeConstraintSolver2.cpp', - 'BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp', - 'BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp', - 'BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp', - 'BulletDynamics/ConstraintSolver/SorLcp.cpp', - - 'BulletDynamics/Dynamics/BU_Joint.cpp', - 'BulletDynamics/Dynamics/ContactJoint.cpp', - 'BulletDynamics/Dynamics/RigidBody.cpp', - ] +sources = [ 'Bullet/BroadphaseCollision/BroadphaseProxy.cpp', + 'Bullet/BroadphaseCollision/CollisionAlgorithm.cpp', + 'Bullet/BroadphaseCollision/CollisionDispatcher.cpp', + 'Bullet/BroadphaseCollision/SimpleBroadphase.cpp', + + 'Bullet/CollisionShapes/BoxShape.cpp', + 'Bullet/CollisionShapes/CollisionShape.cpp', + 'Bullet/CollisionShapes/ConeShape.cpp', + 'Bullet/CollisionShapes/ConvexHullShape.cpp', + 'Bullet/CollisionShapes/ConvexShape.cpp', + 'Bullet/CollisionShapes/CylinderShape.cpp', + 'Bullet/CollisionShapes/MinkowskiSumShape.cpp', + 'Bullet/CollisionShapes/MultiSphereShape.cpp', + 'Bullet/CollisionShapes/PolyhedralConvexShape.cpp', + 'Bullet/CollisionShapes/Simplex1to4Shape.cpp', + 'Bullet/CollisionShapes/SphereShape.cpp', + 'Bullet/CollisionShapes/StridingMeshInterface.cpp', + 'Bullet/CollisionShapes/TriangleMesh.cpp', + 'Bullet/CollisionShapes/TriangleMeshShape.cpp', + 'Bullet/CollisionShapes/BvhTriangleMeshShape.cpp', + 'Bullet/CollisionShapes/ConvexTriangleCallback.cpp', + 'Bullet/CollisionShapes/EmptyShape.cpp', + 'Bullet/CollisionShapes/OptimizedBvh.cpp', + 'Bullet/CollisionShapes/TriangleCallback.cpp', + 'Bullet/CollisionShapes/TriangleIndexVertexArray.cpp', + + 'Bullet/NarrowPhaseCollision/BU_AlgebraicPolynomialSolver.cpp', + 'Bullet/NarrowPhaseCollision/BU_Collidable.cpp', + 'Bullet/NarrowPhaseCollision/BU_CollisionPair.cpp', + 'Bullet/NarrowPhaseCollision/BU_EdgeEdge.cpp', + 'Bullet/NarrowPhaseCollision/BU_Screwing.cpp', + 'Bullet/NarrowPhaseCollision/BU_VertexPoly.cpp', + 'Bullet/NarrowPhaseCollision/ContinuousConvexCollision.cpp', + 'Bullet/NarrowPhaseCollision/ConvexCast.cpp', + 'Bullet/NarrowPhaseCollision/GjkConvexCast.cpp', + 'Bullet/NarrowPhaseCollision/GjkPairDetector.cpp', + 'Bullet/NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.cpp', + 'Bullet/NarrowPhaseCollision/PersistentManifold.cpp', + 'Bullet/NarrowPhaseCollision/RaycastCallback.cpp', + 'Bullet/NarrowPhaseCollision/SubSimplexConvexCast.cpp', + 'Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp', + 'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp', + + 'BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp', + 'BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp', + 'BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp', + 'BulletDynamics/CollisionDispatch/ManifoldResult.cpp', + 'BulletDynamics/CollisionDispatch/ToiContactDispatcher.cpp', + 'BulletDynamics/CollisionDispatch/UnionFind.cpp', + + 'BulletDynamics/ConstraintSolver/ContactConstraint.cpp', + 'BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp', + 'BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp', + 'BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp', + 'BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp', + 'BulletDynamics/ConstraintSolver/SorLcp.cpp', + + 'BulletDynamics/Dynamics/BU_Joint.cpp', + 'BulletDynamics/Dynamics/ContactJoint.cpp', + 'BulletDynamics/Dynamics/RigidBody.cpp'] -bullet_env.Append (CPPPATH = ['.', - 'Bullet', - 'BulletDynamics', - 'LinearMath' - ]) -source_files = bullet_sources +#sources = env.Glob('Bullet/BroadPhaseCollision/*.cpp') +#sources += env.Glob('Bullet/CollisionShapes/*.cpp') +#sources += env.Glob('Bullet/NarrowPhaseCollision/*.cpp') +#sources += env.Glob('BulletDynamics/CollisionDispatch/*.cpp') +#sources += env.Glob('BulletDynamics/ConstraintSolver/*.cpp') +#sources += env.Glob('BulletDynamics/Dynamics/*.cpp') -bullet_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_bullet', source=bullet_sources) +incs = '. Bullet BulletDynamics LinearMath' + +env.BlenderLib ( libname = 'extern_bullet', sources=sources, includes=Split(incs), defines=Split(defs), libtype='game2', priority=20, compileflags=cflags ) |