diff options
Diffstat (limited to 'extern')
-rw-r--r-- | extern/SConscript | 16 | ||||
-rw-r--r-- | extern/bFTGL/SConscript | 61 | ||||
-rw-r--r-- | extern/bullet/SConscript | 178 | ||||
-rw-r--r-- | extern/qhull/SConscript | 54 | ||||
-rw-r--r-- | extern/solid/SConscript | 75 |
5 files changed, 153 insertions, 231 deletions
diff --git a/extern/SConscript b/extern/SConscript index d11db23ab7a..15cace23c6c 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -1,14 +1,10 @@ #!/usr/bin/python -Import('user_options_dict') +Import('env') - -print "externs..." SConscript(['qhull/SConscript', - 'solid/SConscript', - 'bullet/SConscript']) - - -if user_options_dict['USE_INTERNATIONAL'] == 1: - print "bftgl" - SConscript(['bFTGL/SConscript'])
\ No newline at end of file + 'solid/SConscript', + 'bullet/SConscript']) + +if env['WITH_BF_FREETYPE'] == 1: + SConscript(['bFTGL/SConscript']) diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript index 5504965b1c9..a201cbae125 100644 --- a/extern/bFTGL/SConscript +++ b/extern/bFTGL/SConscript @@ -2,52 +2,29 @@ import sys import os -ftgl_env = Environment(ENV=os.environ) +Import('env') # Import the C flags set in the SConstruct file -Import ('cflags') -Import ('defines') -Import ('user_options_dict') +#Import ('cflags') +#Import ('defines') +#Import ('user_options_dict') -if sys.platform=='linux2' or sys.platform=='linux-i386': - ftgl_env.Append (CCFLAGS = ['-O2', '-ansi']) -elif sys.platform=='win32': - ftgl_env.Append (CCFLAGS = ['/O2']) -elif sys.platform=='sunos': - ftgl_env.Append (CCFLAGS = ['Xc', '-v', '-fast']) -elif sys.platform=='darwin': - ftgl_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4']) -else: - ftgl_env.Append (CCFLAGS = cflags) +#if sys.platform=='linux2' or sys.platform=='linux-i386': +# ftgl_env.Append (CCFLAGS = ['-O2', '-ansi']) +#elif sys.platform=='win32': + #ftgl_env.Append (CCFLAGS = ['/O2']) +#elif sys.platform=='sunos': +# ftgl_env.Append (CCFLAGS = ['Xc', '-v', '-fast']) +#elif sys.platform=='darwin': +# ftgl_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4']) +#else: +# ftgl_env.Append (CCFLAGS = cflags) -ftgl_env.Append (CPPDEFINES = defines) -ftgl_env.Append (CPPPATH = ['include', - 'src']) +#ftgl_env.Append (CPPDEFINES = defines) -ftgl_env.Append (CPPPATH = user_options_dict['FREETYPE_INCLUDE']) +incs = 'include src ' + env['BF_FREETYPE_INC'] +defs = '' -source_files = [ - 'src/FTBitmapGlyph.cpp', - 'src/FTCharmap.cpp', - 'src/FTContour.cpp', - 'src/FTExtrdGlyph.cpp', - 'src/FTFace.cpp', - 'src/FTFont.cpp', - 'src/FTGLBitmapFont.cpp', - 'src/FTGLExtrdFont.cpp', - 'src/FTGLOutlineFont.cpp', - 'src/FTGLPixmapFont.cpp', - 'src/FTGLPolygonFont.cpp', - 'src/FTGLTextureFont.cpp', - 'src/FTGlyph.cpp', - 'src/FTGlyphContainer.cpp', - 'src/FTLibrary.cpp', - 'src/FTOutlineGlyph.cpp', - 'src/FTPixmapGlyph.cpp', - 'src/FTPoint.cpp', - 'src/FTPolyGlyph.cpp', - 'src/FTSize.cpp', - 'src/FTTextureGlyph.cpp', - 'src/FTVectoriser.cpp'] +sources = env.Glob('src/*.cpp') -ftgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_ftgl', source=source_files) +env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype='international', priority=5) 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 ) diff --git a/extern/qhull/SConscript b/extern/qhull/SConscript index 927ca3a6a0d..2d767cfc58d 100644 --- a/extern/qhull/SConscript +++ b/extern/qhull/SConscript @@ -2,38 +2,34 @@ import sys import os -qhull_env = Environment(ENV = os.environ) - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('defines') -Import ('user_options_dict') +Import('env') +defs = '' +cflags = [] if sys.platform=='linux2' or sys.platform=='linux-i386': - qhull_env.Append (CCFLAGS = ['-O2', '-ansi']) -elif sys.platform=='win32': - qhull_env.Append (CCFLAGS = ['/O2']) + cflags += ['-O2','-ansi'] +elif env['OURPLATFORM']=='win32-vc': + cflags += ['/O2'] +elif env['OURPLATFORM']=='win32-mingw': + cflags += ['-O2'] elif sys.platform=='sunos': - qhull_env.Append (CCFLAGS = ['Xc', '-v', '-fast']) + cflags += ['Xc', '-v', '-fast'] elif sys.platform=='darwin': - qhull_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4']) -else: - qhull_env.Append (CCFLAGS = cflags) -qhull_env.Append (CPPDEFINES = defines) + cflags += ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] + +sources = ['src/geom.c', + 'src/geom2.c', + 'src/global.c', + 'src/io.c', + 'src/mem.c', + 'src/merge.c', + 'src/poly.c', + 'src/poly2.c', + 'src/qhull.c', + 'src/qset.c', + 'src/stat.c', + 'src/user.c'] -source_files = ['src/geom.c', - 'src/geom2.c', - 'src/global.c', - 'src/io.c', - 'src/mem.c', - 'src/merge.c', - 'src/poly.c', - 'src/poly2.c', - 'src/qhull.c', - 'src/qset.c', - 'src/stat.c', - 'src/user.c'] -qhull_env.Append (CPPPATH = ['include', - 'src']) +incs = 'include src' -qhull_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_qhull', source=source_files) +env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype='game2', priority=50, compileflags = cflags) diff --git a/extern/solid/SConscript b/extern/solid/SConscript index 00402d640e8..673a9951ea4 100644 --- a/extern/solid/SConscript +++ b/extern/solid/SConscript @@ -1,29 +1,23 @@ #!/usr/bin/python import sys -import os -solid_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', '/Og', '/Ot', '/Ob1', '/Op', '/G6'] +elif 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'] + defs += ' NDEBUG' + cflags += ['-O2'] elif sys.platform=='darwin' : - defines += ['NDEBUG'] - cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] + defs += ' NDEBUG' + cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'] else: print "################################################" @@ -33,45 +27,8 @@ else: print "and cflags / cxxflags to the" print "extern/solid/SConscript file" -solid_env.Append (CCFLAGS = cflags) -solid_env.Append (CPPFLAGS = cxxflags) +sources = env.Glob('src/*.cpp') + env.Glob('src/convex/*.cpp') + env.Glob('src/complex/*.cpp') + env.Glob('src/broad/*.cpp') -solid_env.Append (CPPDEFINES = defines) +incs = 'include src src/broad src/complex src/convex ../qhull/include' -solid_sources = ['src/DT_C-api.cpp', - 'src/DT_Encounter.cpp', - 'src/DT_Object.cpp', - 'src/DT_RespTable.cpp', - 'src/DT_Scene.cpp'] - -convex_sources = ['src/convex/DT_Accuracy.cpp', - 'src/convex/DT_Box.cpp', - 'src/convex/DT_Cone.cpp', - 'src/convex/DT_Convex.cpp', - 'src/convex/DT_Cylinder.cpp', - 'src/convex/DT_Facet.cpp', - 'src/convex/DT_LineSegment.cpp', - 'src/convex/DT_PenDepth.cpp', - 'src/convex/DT_Point.cpp', - 'src/convex/DT_Polyhedron.cpp', - 'src/convex/DT_Polytope.cpp', - 'src/convex/DT_Sphere.cpp', - 'src/convex/DT_Triangle.cpp'] - -complex_sources = ['src/complex/DT_BBoxTree.cpp', - 'src/complex/DT_Complex.cpp'] - -broad_sources = ['src/broad/BP_C-api.cpp', - 'src/broad/BP_EndpointList.cpp', - 'src/broad/BP_Proxy.cpp', - 'src/broad/BP_Scene.cpp'] - -solid_env.Append (CPPPATH = ['include', - 'src', - 'src/broad', - 'src/complex', - 'src/convex', - '../qhull/include']) -source_files = solid_sources + convex_sources + complex_sources + broad_sources - -solid_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_solid', source=source_files) +env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype='game2', priority=45 , compileflags = cflags) |