[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13168] branches/blender2.5/blender: * tweak linking priorities - should help for GCC users
Nathan Letwory
jesterking at letwory.net
Tue Jan 8 10:47:45 CET 2008
Revision: 13168
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13168
Author: jesterking
Date: 2008-01-08 10:47:44 +0100 (Tue, 08 Jan 2008)
Log Message:
-----------
* tweak linking priorities - should help for GCC users
* some lib renaming
Modified Paths:
--------------
branches/blender2.5/blender/extern/SConscript
branches/blender2.5/blender/extern/bullet2/src/SConscript
branches/blender2.5/blender/extern/ffmpeg/SConscript
branches/blender2.5/blender/extern/qhull/SConscript
branches/blender2.5/blender/extern/solid/SConscript
branches/blender2.5/blender/intern/SConscript
branches/blender2.5/blender/intern/SoundSystem/SConscript
branches/blender2.5/blender/intern/boolop/SConscript
branches/blender2.5/blender/intern/bsp/SConscript
branches/blender2.5/blender/intern/container/SConscript
branches/blender2.5/blender/intern/decimation/SConscript
branches/blender2.5/blender/intern/elbeem/SConscript
branches/blender2.5/blender/intern/ghost/SConscript
branches/blender2.5/blender/intern/guardedalloc/SConscript
branches/blender2.5/blender/intern/iksolver/SConscript
branches/blender2.5/blender/intern/moto/SConscript
branches/blender2.5/blender/intern/opennl/SConscript
branches/blender2.5/blender/intern/string/SConscript
branches/blender2.5/blender/source/blender/avi/SConscript
branches/blender2.5/blender/source/blender/blenkernel/SConscript
branches/blender2.5/blender/source/blender/blenlib/SConscript
branches/blender2.5/blender/source/blender/blenloader/SConscript
branches/blender2.5/blender/source/blender/blenpluginapi/SConscript
branches/blender2.5/blender/source/blender/editors/interface/SConscript
branches/blender2.5/blender/source/blender/editors/screen/SConscript
branches/blender2.5/blender/source/blender/editors/space_view3d/SConscript
branches/blender2.5/blender/source/blender/ftfont/SConscript
branches/blender2.5/blender/source/blender/imbuf/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/cineon/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/dds/SConscript
branches/blender2.5/blender/source/blender/imbuf/intern/openexr/SConscript
branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
branches/blender2.5/blender/source/blender/nodes/SConscript
branches/blender2.5/blender/source/blender/python/SConscript
branches/blender2.5/blender/source/blender/quicktime/SConscript
branches/blender2.5/blender/source/blender/radiosity/SConscript
branches/blender2.5/blender/source/blender/render/SConscript
branches/blender2.5/blender/source/blender/windowmanager/SConscript
branches/blender2.5/blender/source/creator/SConscript
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/Expressions/SConscript
branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Network/SConscript
branches/blender2.5/blender/source/gameengine/Physics/BlOde/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Dummy/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Sumo/SConscript
branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/SConscript
branches/blender2.5/blender/source/gameengine/SConscript
branches/blender2.5/blender/source/gameengine/SceneGraph/SConscript
branches/blender2.5/blender/source/kernel/SConscript
Modified: branches/blender2.5/blender/extern/SConscript
===================================================================
--- branches/blender2.5/blender/extern/SConscript 2008-01-08 09:25:50 UTC (rev 13167)
+++ branches/blender2.5/blender/extern/SConscript 2008-01-08 09:47:44 UTC (rev 13168)
@@ -3,16 +3,16 @@
Import('env')
if env['WITH_BF_GAMEENGINE']:
- SConscript(['qhull/SConscript',
- 'solid/SConscript'])
- if env['WITH_BF_BULLET']:
- SConscript(['bullet2/src/SConscript'])
+ SConscript(['qhull/SConscript',
+ 'solid/SConscript'])
+ if env['WITH_BF_BULLET']:
+ SConscript(['bullet2/src/SConscript'])
if env['WITH_BF_INTERNATIONAL']:
- SConscript(['bFTGL/SConscript'])
+ SConscript(['bFTGL/SConscript'])
if env['WITH_BF_VERSE']:
- SConscript(['verse/dist/SConstruct'])
+ SConscript(['verse/dist/SConstruct'])
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
- SConscript(['ffmpeg/SConscript']);
+ SConscript(['ffmpeg/SConscript']);
Modified: branches/blender2.5/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/blender2.5/blender/extern/bullet2/src/SConscript 2008-01-08 09:25:50 UTC (rev 13167)
+++ branches/blender2.5/blender/extern/bullet2/src/SConscript 2008-01-08 09:47:44 UTC (rev 13168)
@@ -8,90 +8,90 @@
cflags = []
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']
+ defs += ' WIN32 NDEBUG _WINDOWS _LIB'
+ #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
+ cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
elif env['OURPLATFORM']=='win32-mingw':
- defs += ' NDEBUG'
- cflags += ['-O2']
+ defs += ' NDEBUG'
+ cflags += ['-O2']
elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
- defs += ' NDEBUG'
- cflags += ['-O2']
+ defs += ' NDEBUG'
+ cflags += ['-O2']
elif sys.platform=='darwin':
- defs += ' NDEBUG'
- cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
+ defs += ' NDEBUG'
+ cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
linearmath_src = env.Glob("LinearMath/*.cpp")
bulletdyn_src = ["BulletDynamics/ConstraintSolver/btContactConstraint.cpp",
- "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp",
- "BulletDynamics/ConstraintSolver/btHingeConstraint.cpp",
- "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp",
- "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp",
- "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp",
- "BulletDynamics/ConstraintSolver/btTypedConstraint.cpp",
- "BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp",
- "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp",
- "BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp",
- "BulletDynamics/Dynamics/btRigidBody.cpp",
- "BulletDynamics/Vehicle/btRaycastVehicle.cpp",
- "BulletDynamics/Vehicle/btWheelInfo.cpp"]
+ "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp",
+ "BulletDynamics/ConstraintSolver/btHingeConstraint.cpp",
+ "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp",
+ "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp",
+ "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp",
+ "BulletDynamics/ConstraintSolver/btTypedConstraint.cpp",
+ "BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp",
+ "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp",
+ "BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp",
+ "BulletDynamics/Dynamics/btRigidBody.cpp",
+ "BulletDynamics/Vehicle/btRaycastVehicle.cpp",
+ "BulletDynamics/Vehicle/btWheelInfo.cpp"]
collision_src = ["BulletCollision/BroadphaseCollision/btAxisSweep3.cpp",
- "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp",
- "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp",
- "BulletCollision/BroadphaseCollision/btDispatcher.cpp",
- "BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp",
- "BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp",
- "BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp",
- "BulletCollision/CollisionDispatch/btCollisionObject.cpp",
- "BulletCollision/CollisionDispatch/btCollisionWorld.cpp",
- "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp",
- "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp",
- "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp",
- "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp",
- "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp",
- "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp",
- "BulletCollision/CollisionDispatch/btManifoldResult.cpp",
- "BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp",
- "BulletCollision/CollisionDispatch/btUnionFind.cpp",
- "BulletCollision/CollisionShapes/btBoxShape.cpp",
- "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp",
- "BulletCollision/CollisionShapes/btCollisionShape.cpp",
- "BulletCollision/CollisionShapes/btCompoundShape.cpp",
- "BulletCollision/CollisionShapes/btConcaveShape.cpp",
- "BulletCollision/CollisionShapes/btConeShape.cpp",
- "BulletCollision/CollisionShapes/btConvexHullShape.cpp",
- "BulletCollision/CollisionShapes/btConvexShape.cpp",
- "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp",
- "BulletCollision/CollisionShapes/btCylinderShape.cpp",
- "BulletCollision/CollisionShapes/btEmptyShape.cpp",
- "BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp",
- "BulletCollision/CollisionShapes/btMultiSphereShape.cpp",
- "BulletCollision/CollisionShapes/btOptimizedBvh.cpp",
- "BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp",
- "BulletCollision/CollisionShapes/btTetrahedronShape.cpp",
- "BulletCollision/CollisionShapes/btSphereShape.cpp",
- "BulletCollision/CollisionShapes/btStaticPlaneShape.cpp",
- "BulletCollision/CollisionShapes/btStridingMeshInterface.cpp",
- "BulletCollision/CollisionShapes/btTriangleCallback.cpp",
- "BulletCollision/CollisionShapes/btTriangleBuffer.cpp",
- "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp",
- "BulletCollision/CollisionShapes/btTriangleMesh.cpp",
- "BulletCollision/CollisionShapes/btTriangleMeshShape.cpp",
- "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp",
- "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp",
- "BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp",
- "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp",
- "BulletCollision/NarrowPhaseCollision/btConvexCast.cpp",
- "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp",
- "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp",
- "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp",
- "BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp",
- "BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp",
- "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp",
- "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp"]
+ "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp",
+ "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp",
+ "BulletCollision/BroadphaseCollision/btDispatcher.cpp",
+ "BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp",
+ "BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp",
+ "BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp",
+ "BulletCollision/CollisionDispatch/btCollisionObject.cpp",
+ "BulletCollision/CollisionDispatch/btCollisionWorld.cpp",
+ "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp",
+ "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp",
+ "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp",
+ "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp",
+ "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp",
+ "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp",
+ "BulletCollision/CollisionDispatch/btManifoldResult.cpp",
+ "BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp",
+ "BulletCollision/CollisionDispatch/btUnionFind.cpp",
+ "BulletCollision/CollisionShapes/btBoxShape.cpp",
+ "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp",
+ "BulletCollision/CollisionShapes/btCollisionShape.cpp",
+ "BulletCollision/CollisionShapes/btCompoundShape.cpp",
+ "BulletCollision/CollisionShapes/btConcaveShape.cpp",
+ "BulletCollision/CollisionShapes/btConeShape.cpp",
+ "BulletCollision/CollisionShapes/btConvexHullShape.cpp",
+ "BulletCollision/CollisionShapes/btConvexShape.cpp",
+ "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp",
+ "BulletCollision/CollisionShapes/btCylinderShape.cpp",
+ "BulletCollision/CollisionShapes/btEmptyShape.cpp",
+ "BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp",
+ "BulletCollision/CollisionShapes/btMultiSphereShape.cpp",
+ "BulletCollision/CollisionShapes/btOptimizedBvh.cpp",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list