* tweak linking priorities - should help for GCC users
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 8 Jan 2008 09:47:44 +0000 (09:47 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 8 Jan 2008 09:47:44 +0000 (09:47 +0000)
* some lib renaming

59 files changed:
extern/SConscript
extern/bullet2/src/SConscript
extern/qhull/SConscript
extern/solid/SConscript
intern/SConscript
intern/SoundSystem/SConscript
intern/boolop/SConscript
intern/bsp/SConscript
intern/container/SConscript
intern/decimation/SConscript
intern/elbeem/SConscript
intern/ghost/SConscript
intern/guardedalloc/SConscript
intern/iksolver/SConscript
intern/moto/SConscript
intern/opennl/SConscript
intern/string/SConscript
source/blender/avi/SConscript
source/blender/blenkernel/SConscript
source/blender/blenlib/SConscript
source/blender/blenloader/SConscript
source/blender/blenpluginapi/SConscript
source/blender/editors/interface/SConscript
source/blender/editors/screen/SConscript
source/blender/editors/space_view3d/SConscript
source/blender/ftfont/SConscript
source/blender/imbuf/SConscript
source/blender/imbuf/intern/cineon/SConscript
source/blender/imbuf/intern/dds/SConscript
source/blender/imbuf/intern/openexr/SConscript
source/blender/makesdna/intern/SConscript
source/blender/nodes/SConscript
source/blender/python/SConscript
source/blender/quicktime/SConscript
source/blender/radiosity/SConscript
source/blender/render/SConscript
source/blender/windowmanager/SConscript
source/creator/SConscript
source/gameengine/BlenderRoutines/SConscript
source/gameengine/Converter/SConscript
source/gameengine/Expressions/SConscript
source/gameengine/GameLogic/SConscript
source/gameengine/GamePlayer/SConscript
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Ketsji/KXNetwork/SConscript
source/gameengine/Ketsji/SConscript
source/gameengine/Network/LoopBackNetwork/SConscript
source/gameengine/Network/SConscript
source/gameengine/Physics/BlOde/SConscript
source/gameengine/Physics/Bullet/SConscript
source/gameengine/Physics/Dummy/SConscript
source/gameengine/Physics/Sumo/SConscript
source/gameengine/Physics/common/SConscript
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
source/gameengine/Rasterizer/SConscript
source/gameengine/SConscript
source/gameengine/SceneGraph/SConscript
source/kernel/SConscript

index 924b7f5..2c6ab5b 100644 (file)
@@ -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']);
index 6280c49..8bf3277 100644 (file)
@@ -8,90 +8,90 @@ defs = 'USE_DOUBLES QHULL _LIB'
 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",
+                                "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"]
 
 incs = '. BulletCollision BulletDynamics LinearMath'
 
-env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[19, 169], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision', sources=collision_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 165], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 160], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision', sources=collision_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[30, 170], compileflags=cflags )
index 7f911d1..6e305ff 100644 (file)
@@ -6,30 +6,30 @@ Import('env')
 defs = ''
 cflags = []
 if sys.platform=='linux2' or sys.platform=='linux-i386':
-   cflags += ['-O2','-ansi']
+       cflags += ['-O2','-ansi']
 elif env['OURPLATFORM']=='win32-vc':
-   cflags += ['/O2']
+       cflags += ['/O2']
 elif env['OURPLATFORM']=='win32-mingw':
-   cflags += ['-O2']
+       cflags += ['-O2']
 elif sys.platform=='sunos5':
-   cflags += ['-O2', '-ansi']
+       cflags += ['-O2', '-ansi']
 elif sys.platform=='darwin':
-   cflags += ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
+       cflags += ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
 
 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']
+       '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']
 
 
 incs = 'include src'
 
-env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype=['game2','player'], priority=[50, 85], compileflags = cflags)
+env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs), libtype=['game2','player'], priority=[55, 70], compileflags = cflags)
index 7482014..f30b4a3 100644 (file)
@@ -7,28 +7,28 @@ defs = 'USE_DOUBLES QHULL _LIB'
 cflags = []
 
 if env['OURPLATFORM']=='win32-vc':
-    defs += ' WIN32 NDEBUG _WINDOWS _LIB'
-    cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
+       defs += ' WIN32 NDEBUG _WINDOWS _LIB'
+       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' or sys.platform=='openbsd3' or sys.platform=='sunos5':
-    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']
 
 else:
-    print "################################################"
-    print 
-    print "Check if solid builds on your platform correctly"
-    print "Add your platform specific defines"
-    print "and cflags / cxxflags to the"
-    print "extern/solid/SConscript file"
+       print "################################################"
+       print 
+       print "Check if solid builds on your platform correctly"
+       print "Add your platform specific defines"
+       print "and cflags / cxxflags to the"
+       print "extern/solid/SConscript file"
 
 sources = env.Glob('src/*.cpp') + env.Glob('src/convex/*.cpp') + env.Glob('src/complex/*.cpp') + env.Glob('src/broad/*.cpp')
 
 incs = 'include src src/broad src/complex src/convex ../qhull/include'
 
-env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2','player'], priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_solid', sources=sources, includes=Split(incs), defines=Split(defs), libtype=['game2','player'], priority=[50, 65] , compileflags = cflags)
index f6092b7..2d68969 100644 (file)
@@ -2,17 +2,17 @@
 Import ('env')
 
 SConscript(['SoundSystem/SConscript',
-            'string/SConscript',
-            'ghost/SConscript',
-            'guardedalloc/SConscript',
-            'bmfont/SConscript',
-            'moto/SConscript',
-            'container/SConscript',
-            'memutil/SConscript/',
-            'decimation/SConscript',
-            'iksolver/SConscript',
-            'boolop/SConscript',
-            'opennl/SConscript'])
+                       'string/SConscript',
+                       'ghost/SConscript',
+                       'guardedalloc/SConscript',
+                       'bmfont/SConscript',
+                       'moto/SConscript',
+                       'container/SConscript',
+                       'memutil/SConscript/',
+                       'decimation/SConscript',
+                       'iksolver/SConscript',
+                       'boolop/SConscript',
+                       'opennl/SConscript'])
 
 # NEW_CSG was intended for intern/csg, but
 # getting it to compile is difficult
@@ -21,9 +21,9 @@ SConscript(['SoundSystem/SConscript',
 NEW_CSG='false'
 
 if env['BF_NO_ELBEEM'] == 0:
-    SConscript(['elbeem/SConscript'])
+       SConscript(['elbeem/SConscript'])
 
 if NEW_CSG=='false':
-    SConscript(['bsp/SConscript'])
+       SConscript(['bsp/SConscript'])
 else:
-    SConscript(['csg/SConscript'])
+       SConscript(['csg/SConscript'])
index a9c1110..97a3432 100644 (file)
@@ -7,10 +7,10 @@ sources = env.Glob('dummy/*.cpp') + env.Glob('intern/*.cpp')
 incs = '. intern ../moto/include ../string dummy openal sdl'
 defs = ''
 if env['WITH_BF_OPENAL']:
-    sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp')
-    incs += ' ' + env['BF_OPENAL_INC']
-    incs += ' ' + env['BF_SDL_INC']
+       sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp')
+       incs += ' ' + env['BF_OPENAL_INC']
+       incs += ' ' + env['BF_SDL_INC']
 else:
-    defs = 'NO_SOUND'
+       defs = 'NO_SOUND'
 
-env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [20,140] )
+env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [30,135] )
index a3f3c0b..6bd0842 100644 (file)
@@ -8,7 +8,7 @@ incs += ' ../../source/blender/makesdna ../../intern/guardedalloc'
 incs += ' ../../source/blender/blenlib'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
+       env.BlenderLib ('bf_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
 else:
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
+       env.BlenderLib ('bf_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
 
index e363fd1..10dc29e 100644 (file)
@@ -6,7 +6,7 @@ sources = env.Glob('intern/*.cpp')
 incs = 'intern ../container ../moto/include ../memutil'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
+       env.BlenderLib ('bf_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
 else:
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=15 )
+       env.BlenderLib ('bf_BSP', sources, Split(incs), [], libtype='core', priority=20 )
 
index d05104d..18f078b 100644 (file)
@@ -4,4 +4,4 @@ Import ('env')
 sources = env.Glob('intern/*.cpp')
 incs = '.'
 
-env.BlenderLib ('blender_CTR', sources, Split(incs) , [], libtype='intern', priority = 10 )
+env.BlenderLib ('bf_CTR', sources, Split(incs) , [], libtype='intern', priority = 10 )
index cf199fb..2dd2ac3 100644 (file)
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = '. ../moto/include ../container ../memutil'
 
-env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 25] )
+env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 20] )
index bb6637b..0c0365d 100644 (file)
@@ -7,7 +7,7 @@ sources = env.Glob('intern/*.cpp')
 
 defs = 'NOGUI ELBEEM_BLENDER=1'
 if env['OURPLATFORM']=='win32-vc':
-    defs += ' USE_MSVC6FIXES'
+       defs += ' USE_MSVC6FIXES'
 incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] + ' ' +env['BF_SDL_INC']
 
 env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 )
index 40968e8..7e00a75 100644 (file)
@@ -11,22 +11,22 @@ sources = env.Glob('intern/*.cpp')
 pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
 
 if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6'):
-    for f in pf:
-        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+       for f in pf:
+               sources.remove('intern' + os.sep + f + 'Win32.cpp')
+               sources.remove('intern' + os.sep + f + 'Carbon.cpp')
 elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
-    for f in pf:
-        sources.remove('intern' + os.sep + f + 'X11.cpp')
-        sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+       for f in pf:
+               sources.remove('intern' + os.sep + f + 'X11.cpp')
+               sources.remove('intern' + os.sep + f + 'Carbon.cpp')
 elif window_system == 'darwin':
-    for f in pf:
-        sources.remove('intern' + os.sep + f + 'Win32.cpp')
-        sources.remove('intern' + os.sep + f + 'X11.cpp')
+       for f in pf:
+               sources.remove('intern' + os.sep + f + 'Win32.cpp')
+               sources.remove('intern' + os.sep + f + 'X11.cpp')
 else:
-    print "Unknown window system specified."
-    Exit()
+       print "Unknown window system specified."
+       Exit()
 
 incs = '. ../string ' + env['BF_OPENGL_INC']
 if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
-    incs = env['BF_WINTAB_INC'] + ' ' + incs
-env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','player'], priority = [25,15] ) 
+       incs = env['BF_WINTAB_INC'] + ' ' + incs
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','player'], priority = [40,5] ) 
index ef6c6b4..0184ddd 100644 (file)
@@ -5,4 +5,4 @@ Import('env')
 sources = env.Glob('intern/*.c')
 incs = '.'
 
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [10, 175] )
+env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [5, 175] )
index 81bf61d..ce4a053 100644 (file)
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = 'intern ../moto/include ../memutil'
 
-env.BlenderLib ('blender_IK', sources, Split(incs), [], libtype='blender', priority=10 )
+env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype='blender', priority=10 )
index 636515a..4152633 100644 (file)
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = 'include'
 
-env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )
+env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 60, 130] )
index bcfb030..56ad5a5 100644 (file)
@@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
 incs = 'extern superlu'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
+       env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
 else:
-    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=55 )
+       env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=65 )
 
index 7f817f8..06d74af 100644 (file)
@@ -4,4 +4,4 @@ Import ('env')
 sources = env.Glob('intern/*.cpp')
 incs = '.'
 
-env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [30,10] )
+env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [50,0] )
index 91239c6..8c16af9 100644 (file)
@@ -7,4 +7,4 @@ sources = env.Glob('intern/*.c')
 incs = '. #/intern/guardedalloc'
 incs += ' ' + env['BF_JPEG_INC']
 
-env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [90, 50] )
+env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [105, 40] )
index 75023f1..96ec8c3 100644 (file)
@@ -26,22 +26,22 @@ if env['WITH_BF_VERSE']:
        defs += ' WITH_VERSE'
        
 if env['WITH_BF_OPENEXR'] == 1:
-    defs += ' WITH_OPENEXR'
+       defs += ' WITH_OPENEXR'
 
 if env['WITH_BF_DDS'] == 1:
-    defs += ' WITH_DDS'
+       defs += ' WITH_DDS'
 
 if env['WITH_BF_FFMPEG'] == 1:
-    defs += ' WITH_FFMPEG'
-    incs += ' ' + env['BF_FFMPEG_INC']
+       defs += ' WITH_FFMPEG'
+       incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_QUICKTIME'] == 1:
-    defs += ' WITH_QUICKTIME'
-    incs += ' ' + env['BF_QUICKTIME_INC']
+       defs += ' WITH_QUICKTIME'
+       incs += ' ' + env['BF_QUICKTIME_INC']
 
 defs += ' WITH_CCGSUBSURF'
 
 if env['WITH_BF_PLAYER']:
-    SConscript(['bad_level_call_stubs/SConscript'])
+       SConscript(['bad_level_call_stubs/SConscript'])
 
-env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )
+env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [75, 10] )
index 23d0640..9d81ac0 100644 (file)
@@ -11,16 +11,16 @@ incs += ' ' + env['BF_SDL_INC']
 defs = ''
 
 if env['WITH_BF_INTERNATIONAL'] == 1:
-    defs = 'WITH_FREETYPE2'
+       defs = 'WITH_FREETYPE2'
 
 if env['WITH_BF_VERSE']:
        defs += ' WITH_VERSE'
        incs += ' ' + env['BF_VERSE_INCLUDE']
 
 if env['OURPLATFORM'] == 'linux2':
-    cflags='-pthread'
+       cflags='-pthread'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
+       incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [100,195], compileflags =cflags )
index 097f54a..37d5f53 100644 (file)
@@ -15,4 +15,4 @@ if env['WITH_BF_VERSE']:
        defs += ' WITH_VERSE'
        incs += ' ' + env['BF_VERSE_INCLUDE']
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [70, 30] )
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85, 25] )
index d17a35e..aa6e255 100644 (file)
@@ -11,4 +11,4 @@ if env['WITH_BF_QUICKTIME'] == 1:
        defs.append('WITH_QUICKTIME')
        incs += ' ' + env['BF_QUICKTIME_INC']
 
-env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [75, 35] )
+env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [90, 30] )
index e69de29..5743674 100644 (file)
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' #/intern/guardedalloc'
+
+env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), [], libtype=['core','intern'], priority=[15, 30] )
index e02c0d0..786caa1 100644 (file)
@@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../blenloader ../../windowmanager ../../python'
 incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
+env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] )
index 3d630ad..14586de 100644 (file)
@@ -6,4 +6,4 @@ sources = env.Glob('*.c')
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
+env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[25, 35] )
index aab303a..9cdfbe4 100644 (file)
@@ -8,7 +8,7 @@ incs = '. intern ../blenkernel ../blenlib ../makesdna ../editors/include'
 incs += ' ' + env['BF_FTGL_INC']
 incs += ' ' + env['BF_FREETYPE_INC']
 incs += ' ' + env['BF_GETTEXT_INC']
-                 
+
 defs = 'FTGL_STATIC_LIBRARY'
 if sys.platform == 'win32':
        defs += ' _WIN32 USE_GETTEXT_DLL'
index f9e46b2..9d8bcf5 100644 (file)
@@ -18,17 +18,17 @@ if env['WITH_BF_VERSE']:
        incs += ' ' + env['BF_VERSE_INCLUDE']
        
 if env['WITH_BF_OPENEXR'] == 1:
-    defs.append('WITH_OPENEXR')
+       defs.append('WITH_OPENEXR')
 
 if env['WITH_BF_DDS'] == 1:
-    defs.append('WITH_DDS')
+       defs.append('WITH_DDS')
 
 if env['WITH_BF_FFMPEG'] == 1:
-    defs.append('WITH_FFMPEG')
-    incs += ' ' + env['BF_FFMPEG_INC']
+       defs.append('WITH_FFMPEG')
+       incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_QUICKTIME']==1:
        incs += ' ' + env['BF_QUICKTIME_INC']
        defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [95, 35] )
index 7bfaa8d..9d3bbcb 100644 (file)
@@ -4,14 +4,14 @@ Import ('env')
 source_files = env.Glob('*.c')
 
 incs = ['.',
-    '../../../blenkernel',
-    '../../',
-    '..',
-    '../../../blenlib',
-    'intern/include',
-    '#/intern/guardedalloc',
-    '../../../makesdna']
+       '../../../blenkernel',
+       '../../',
+       '..',
+       '../../../blenlib',
+       'intern/include',
+       '#/intern/guardedalloc',
+       '../../../makesdna']
 
 defs = []
-                 
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
+
+env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [120, 75])
index d005bae..f56c238 100644 (file)
@@ -16,4 +16,4 @@ incs = ['.',
 
 defs = ['WITH_DDS']
 
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
+env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [110, 105])
index 1b0a0ed..2ce3d18 100644 (file)
@@ -14,5 +14,5 @@ incs = ['.',
 incs += Split(env['BF_OPENEXR_INC'])
 
 defs = []
-                 
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
+
+env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [125, 85])
index fe712af..762f999 100644 (file)
@@ -14,28 +14,28 @@ dna = env.Copy()
 makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
 
 makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
-                                 '../../makesdna'])
+                                                                '../../makesdna'])
 
 if env['OURPLATFORM'] == 'linuxcross':
-    makesdna_tool.Replace(CC='gcc')
-    makesdna_tool.Replace(AR='ar')
-    makesdna_tool.Replace(LINK='gcc')
+       makesdna_tool.Replace(CC='gcc')
+       makesdna_tool.Replace(AR='ar')
+       makesdna_tool.Replace(LINK='gcc')
 
 if sys.platform != 'cygwin':
-    makesdna_tool.Append (CCFLAGS = cflags)
+       makesdna_tool.Append (CCFLAGS = cflags)
 makesdna_tool.Append (CPPDEFINES = defines)
 makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib')
 
 if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep:
-    makesdna = makesdna_tool.Program (target = root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc'])
+       makesdna = makesdna_tool.Program (target = root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc'])
 else:
-    makesdna = makesdna_tool.Program (target = '#'+root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc'])
+       makesdna = makesdna_tool.Program (target = '#'+root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc'])
 
 dna_dict = dna.Dictionary()
 dna.Depends ('dna.c', makesdna)
 if env['OURPLATFORM'] != 'linuxcross':
-    dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET")
+       dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET")
 else:
-    dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET")
+       dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET")
 obj = 'intern/dna.c'
 Return ('obj')
index 0020094..746be45 100644 (file)
@@ -21,26 +21,26 @@ incs += ' ' + env['BF_SDL_INC']
 defs = ''
 
 if env['WITH_BF_INTERNATIONAL']:
-    defs += 'WITH_FREETYPE2'
+       defs += 'WITH_FREETYPE2'
 
 if env['WITH_BF_VERSE']:
-    defs += ' WITH_VERSE'
-    incs += ' ' + env['BF_VERSE_INCLUDE']
+       defs += ' WITH_VERSE'
+       incs += ' ' + env['BF_VERSE_INCLUDE']
 
 if env['WITH_BF_VERSE']:
-    defs += ' WITH_VERSE'
+       defs += ' WITH_VERSE'
 
 if env['WITH_BF_OPENEXR'] == 1:
-    defs += ' WITH_OPENEXR'
+       defs += ' WITH_OPENEXR'
 
 if env['WITH_BF_FFMPEG'] == 1:
-    defs += ' WITH_FFMPEG'
-    incs += ' ' + env['BF_FFMPEG_INC']
+       defs += ' WITH_FFMPEG'
+       incs += ' ' + env['BF_FFMPEG_INC']
 
 if env['WITH_BF_QUICKTIME'] == 1:
-    defs += ' WITH_QUICKTIME'
-    incs += ' ' + env['BF_QUICKTIME_INC']
+       defs += ' WITH_QUICKTIME'
+       incs += ' ' + env['BF_QUICKTIME_INC']
 
 defs += ' WITH_CCGSUBSURF'
 
-env.BlenderLib ( libname = 'nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )
+env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [80, 15] )
index 78bef4f..40adf0a 100644 (file)
@@ -13,4 +13,4 @@ defs = []
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc') and env['BF_DEBUG']:
        defs.append('Py_TRACE_REFS')
 
-env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [60])
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [70])
index 9749856..d9ab682 100644 (file)
@@ -2,7 +2,7 @@
 Import ('env')
 
 source_files = ['apple/quicktime_import.c',
-                'apple/quicktime_export.c']
+                               'apple/quicktime_export.c']
 
 incs  = ['.',
                 '../quicktime',
@@ -20,10 +20,10 @@ incs  = ['.',
 incs.append(env['BF_QUICKTIME_INC'])
 
 if env['OURPLATFORM'] in ['win32-vc', 'darwin']:
-    types = ['core', 'player']
-    priorities = [95, 200]
+       types = ['core', 'player']
+       priorities = [115, 200]
 else:
-    types = ['core']
-    priorities = [95]
+       types = ['core']
+       priorities = [115]
 
 env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=['WITH_QUICKTIME'], libtype=types, priority=priorities)
index a3e2e7c..9939690 100644 (file)
@@ -9,4 +9,4 @@ incs += ' ../render/intern/include'
 
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'blender_radiosity', sources, Split(incs), [], libtype='core', priority=50 )
+env.BlenderLib ( 'bf_radiosity', sources, Split(incs), [], libtype='core', priority=60 )
index e1e43eb..d06331a 100644 (file)
@@ -11,21 +11,21 @@ incs += ' ../quicktime ../editors/include ../../kernel/gen_messaging'
 defs = []
 
 if env['WITH_BF_YAFRAY'] == 1:
-    incs += ' ../yafray'
+       incs += ' ../yafray'
 else:
-    defs.append('DISABLE_YAFRAY')
+       defs.append('DISABLE_YAFRAY')
 
 if env['WITH_BF_QUICKTIME'] == 1:
-    defs.append('WITH_QUICKTIME')
-    incs += ' ' + env['BF_QUICKTIME_INC']
+       defs.append('WITH_QUICKTIME')
+       incs += ' ' + env['BF_QUICKTIME_INC']
 
 if env['WITH_BF_FFMPEG'] == 1:
-    defs.append('WITH_FFMPEG')
+       defs.append('WITH_FFMPEG')
 
 if env['WITH_BF_OPENEXR']:
-    defs.append('WITH_OPENEXR')
+       defs.append('WITH_OPENEXR')
 
 if env['OURPLATFORM']=='linux2':
-    cflags='-pthread'
+       cflags='-pthread'
 
-env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags )
+env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=55, compileflags=cflags )
index 420cfed..e70a720 100644 (file)
@@ -12,4 +12,4 @@ incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system'
 
 incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont'
 incs += ' #/intern/elbeem'
-env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
+env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[45, 45] )
index 7ff3937..a39937d 100644 (file)
@@ -12,7 +12,7 @@ incs += ' ' + env['BF_OPENGL_INC']
 
 defs = []
 if env['WITH_BF_QUICKTIME']==1:
-    incs += ' ' + env['BF_QUICKTIME_INC']
-    defs.append('WITH_QUICKTIME')
+       incs += ' ' + env['BF_QUICKTIME_INC']
+       defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'blender_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 1 )
+env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 )
index acc49e3..52d187c 100644 (file)
@@ -26,4 +26,4 @@ cxxflags = []
 if env['OURPLATFORM']=='win32-vc':
        cxxflags.append ('/GR')
 
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , compileflags=cxxflags)
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 45] , compileflags=cxxflags)
index 7b35c55..a63881f 100644 (file)
@@ -23,4 +23,4 @@ incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SOLID_INC']
 incs += ' ' + env['BF_BULLET_INC']
 
-env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,70] )
+env.BlenderLib ( 'bf_converter', sources, Split(incs), [], libtype=['game','player'], priority=[5,50] )
index 809ac31..2d49885 100644 (file)
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp')
 incs ='. #source/kernel/gen_system #intern/string #intern/moto/include'
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,125] )
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,120] )
index 7a2c3d9..3806473 100644 (file)
@@ -9,4 +9,4 @@ incs += ' #/source/gameengine/Expressions #/intern/moto/include'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SDL_INC']
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 110] )
+env.BlenderLib ( 'bf_logic', sources, Split(incs), [], libtype=['game','player'], priority=[30, 100] )
index 0b140bb..df6d26e 100644 (file)
@@ -1,3 +1,3 @@
 #!/usr/bin/python
 SConscript(['common/SConscript',
-            'ghost/SConscript'])
+                       'ghost/SConscript'])
index 25f137f..b6e373b 100644 (file)
@@ -4,60 +4,60 @@ Import ('env')
 
 
 source_files = ['bmfont.cpp',
-                'GPC_Canvas.cpp',
-                'GPC_Engine.cpp',
-                'GPC_KeyboardDevice.cpp',
-                'GPC_MouseDevice.cpp',
-                'GPC_PolygonMaterial.cpp',
-                'GPC_RawImage.cpp',
-                'GPC_RawLoadDotBlendArray.cpp',
-                'GPC_RawLogoArrays.cpp',
-                'GPC_RenderTools.cpp',
-                'GPC_System.cpp']
+                               'GPC_Canvas.cpp',
+                               'GPC_Engine.cpp',
+                               'GPC_KeyboardDevice.cpp',
+                               'GPC_MouseDevice.cpp',
+                               'GPC_PolygonMaterial.cpp',
+                               'GPC_RawImage.cpp',
+                               'GPC_RawLoadDotBlendArray.cpp',
+                               'GPC_RawLogoArrays.cpp',
+                               'GPC_RenderTools.cpp',
+                               'GPC_System.cpp']
 
 incs = ['.',
-        '#intern/string',
-        '#intern/ghost',
-        '#intern/guardedalloc',
-        '#intern/bmfont',
-        '#intern/moto/include',
-        '#intern/SoundSystem',
-        '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
-        '#source/kernel/gen_system',
-        '#source/kernel/gen_messaging',
-        '#source/gameengine/Converter',
-        '#source/blender/imbuf',
-        '#source/gameengine/Ketsji',
-        '#source/blender/blenlib',
-        '#source/blender/blenkernel',
-        '#source/blender',
-        '#source/blender/editors/include',
-        '#source/blender/makesdna',
-        '#source/gameengine/Rasterizer',
-        '#source/gameengine/GameLogic',
-        '#source/gameengine/Expressions',
-        '#source/gameengine/Network',
-        '#source/gameengine/SceneGraph',
-        '#source/gameengine/Physics/common',
-        '#source/gameengine/Physics/Sumo',
-        '#source/gameengine/Physics/Sumo/Fuzzics/include',
-        '#source/gameengine/Network/LoopBackNetwork',
-        '#source/gameengine/GamePlayer/ghost',
-        '#source/blender/misc',
-        '#source/blender/blenloader']
-                                
+               '#intern/string',
+               '#intern/ghost',
+               '#intern/guardedalloc',
+               '#intern/bmfont',
+               '#intern/moto/include',
+               '#intern/SoundSystem',
+               '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
+               '#source/kernel/gen_system',
+               '#source/kernel/gen_messaging',
+               '#source/gameengine/Converter',
+               '#source/blender/imbuf',
+               '#source/gameengine/Ketsji',
+               '#source/blender/blenlib',
+               '#source/blender/blenkernel',
+               '#source/blender',
+               '#source/blender/editors/include',
+               '#source/blender/makesdna',
+               '#source/gameengine/Rasterizer',
+               '#source/gameengine/GameLogic',
+               '#source/gameengine/Expressions',
+               '#source/gameengine/Network',
+               '#source/gameengine/SceneGraph',
+               '#source/gameengine/Physics/common',
+               '#source/gameengine/Physics/Sumo',
+               '#source/gameengine/Physics/Sumo/Fuzzics/include',
+               '#source/gameengine/Network/LoopBackNetwork',
+               '#source/gameengine/GamePlayer/ghost',
+               '#source/blender/misc',
+               '#source/blender/blenloader']
+
 #This is all plugin stuff!
 #if sys.platform=='win32':
 #   source_files += ['windows/GPW_Canvas.cpp',
-#                    'windows/GPW_Engine.cpp',
-#                    'windows/GPW_KeyboardDevice.cpp',
-#                    'windows/GPW_System.cpp']
+#                                      'windows/GPW_Engine.cpp',
+#                                      'windows/GPW_KeyboardDevice.cpp',
+#                                      'windows/GPW_System.cpp']
 #   gp_common_env.Append ( CPPPATH = ['windows'])
 #elif sys.platform=='linux2' or sys.platform=='linux-i386':
 #   source_files += ['unix/GPU_Canvas.cpp',
-#                    'unix/GPU_Engine.cpp',
-#                    'unix/GPU_KeyboardDevice.cpp',
-#                    'unix/GPU_System.cpp']
+#                                      'unix/GPU_Engine.cpp',
+#                                      'unix/GPU_KeyboardDevice.cpp',
+#                                      'unix/GPU_System.cpp']
 #   gp_common_env.Append ( CPPPATH = ['unix'])
 
 incs += Split(env['BF_PYTHON_INC'])
@@ -67,6 +67,6 @@ incs += Split(env['BF_ZLIB_INC'])
 
 cflags=[]
 if env['OURPLATFORM']=='win32-vc':
-    cflags = ['/GR']
+       cflags = ['/GR']
 
 env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, compileflags=cflags)
index 4bb31f2..f704f02 100644 (file)
@@ -3,47 +3,47 @@ import sys
 Import ('env')
 
 source_files = ['GPG_Application.cpp',
-                'GPG_Canvas.cpp',
-                'GPG_ghost.cpp',
-                'GPG_KeyboardDevice.cpp',
-                'GPG_System.cpp']
+                               'GPG_Canvas.cpp',
+                               'GPG_ghost.cpp',
+                               'GPG_KeyboardDevice.cpp',
+                               'GPG_System.cpp']
 
 incs = ['.',
-        '#intern/string',
-        '#intern/ghost',
-        '#intern/guardedalloc',
-        '#intern/bmfont',
-        '#intern/moto/include',
-        '#intern/SoundSystem',
-        '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
-        '#source/kernel/gen_system',
-        '#source/kernel/gen_messaging',
-        '#source/gameengine/Converter',
-        '#source/blender/imbuf',
-        '#source/gameengine/Ketsji',
-        '#source/blender/blenlib',
-        '#source/blender/blenkernel',
-        '#source/blender/readblenfile',
-        '#source/blender',
-        '#source/blender/editors/include',
-        '#source/blender/makesdna',
-        '#source/gameengine/Rasterizer',
-        '#source/gameengine/GameLogic',
-        '#source/gameengine/Expressions',
-        '#source/gameengine/Network',
-        '#source/gameengine/SceneGraph',
-        '#source/gameengine/Physics/common',
-        '#source/gameengine/Physics/Sumo',
-        '#source/gameengine/Physics/Sumo/Fuzzics/include',
-        '#source/gameengine/Network/LoopBackNetwork',
-        '#source/gameengine/GamePlayer/common',
-        '#source/blender/misc',
-        '#source/blender/blenloader']
+               '#intern/string',
+               '#intern/ghost',
+               '#intern/guardedalloc',
+               '#intern/bmfont',
+               '#intern/moto/include',
+               '#intern/SoundSystem',
+               '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
+               '#source/kernel/gen_system',
+               '#source/kernel/gen_messaging',
+               '#source/gameengine/Converter',
+               '#source/blender/imbuf',
+               '#source/gameengine/Ketsji',
+               '#source/blender/blenlib',
+               '#source/blender/blenkernel',
+               '#source/blender/readblenfile',
+               '#source/blender',
+               '#source/blender/editors/include',
+               '#source/blender/makesdna',
+               '#source/gameengine/Rasterizer',
+               '#source/gameengine/GameLogic',
+               '#source/gameengine/Expressions',
+               '#source/gameengine/Network',
+               '#source/gameengine/SceneGraph',
+               '#source/gameengine/Physics/common',
+               '#source/gameengine/Physics/Sumo',
+               '#source/gameengine/Physics/Sumo/Fuzzics/include',
+               '#source/gameengine/Network/LoopBackNetwork',
+               '#source/gameengine/GamePlayer/common',
+               '#source/blender/misc',
+               '#source/blender/blenloader']
 
 incs += Split(env['BF_PYTHON_INC'])
 incs += Split(env['BF_SOLID_INC'])
 cflags = []
 if env['OURPLATFORM']=='win32-vc':
-    cflags = ['/GR']
+       cflags = ['/GR']
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags)
+env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=5, compileflags=cflags)
index 2297b96..812d7bf 100644 (file)
@@ -9,4 +9,4 @@ incs += ' #source/gameengine/Network'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 155] )
+env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 145] )
index 320d81f..f9f7920 100644 (file)
@@ -31,4 +31,4 @@ incs += ' ' + env['BF_SDL_INC']
 incs += ' ' + env['BF_BULLET_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags )
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 60], compileflags = cflags )
index 987603f..1cf94cc 100644 (file)
@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[25, 165] )
+env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[35, 155] )
index 0778418..6cbf860 100644 (file)
@@ -5,4 +5,4 @@ sources = env.Glob('*.cpp') #'NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_Netw
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['game2', 'player'], priority=[15, 160] )
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['game2', 'player'], priority=[15, 150] )
index 90e949d..0ffeb1d 100644 (file)
@@ -5,11 +5,11 @@ Import ('library_env')
 phy_ode_env = library_env.Copy ()
 
 source_files = ['OdePhysicsController.cpp',
-                'OdePhysicsEnvironment.cpp']
+                               'OdePhysicsEnvironment.cpp']
 
 phy_ode_env.Append (CPPPATH=['.',
-                             '../common',
-                            ])
+                                                        '../common',
+                                                       ])
 phy_ode_env.Append (CPPPATH=user_options_dict['ODE_INCLUDE'])
 
 phy_ode_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Ode', source=source_files)
index dd6eab0..04abca6 100644 (file)
@@ -9,7 +9,7 @@ incs += ' ' + env['BF_BULLET_INC']
 
 cflags = []
 if env['OURPLATFORM']=='win32-vc':
-    cflags.append('/GR')
-    cflags.append('/O2')
+       cflags.append('/GR')
+       cflags.append('/O2')
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['game','player'], priority=[15,90] )
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['game','player'], priority=[15,80] )
index e24b150..59579eb 100644 (file)
@@ -5,4 +5,4 @@ sources = 'DummyPhysicsEnvironment.cpp'
 
 incs = '. ../common'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['game','player'], priority=[10,100] )
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [], libtype=['game','player'], priority=[10,95] )
index be7922e..bc1db07 100644 (file)
@@ -3,13 +3,13 @@ Import ('env')
 
 sumoenv = env.Copy()
 sources = ['SumoPHYCallbackBridge.cpp',
-                'SumoPhysicsController.cpp',
-                'SumoPhysicsEnvironment.cpp',
-                'Fuzzics/src/SM_FhObject.cpp',
-                'Fuzzics/src/SM_Object.cpp',
-                'Fuzzics/src/SM_Scene.cpp',
-                'Fuzzics/src/SM_MotionState.cpp'
-               ]
+                               'SumoPhysicsController.cpp',
+                               'SumoPhysicsEnvironment.cpp',
+                               'Fuzzics/src/SM_FhObject.cpp',
+                               'Fuzzics/src/SM_Object.cpp',
+                               'Fuzzics/src/SM_Scene.cpp',
+                               'Fuzzics/src/SM_MotionState.cpp'
+                          ]
 
 incs =['.',
        '../common',
@@ -23,4 +23,4 @@ if env['OURPLATFORM']=='win32-vc':
        cflags.append('/GR')
        cflags.append('/O1')
 
-env.BlenderLib ( 'bf_sumo', sources, incs, [], libtype=['game2','player'], priority=[30, 70] , compileflags=cflags)
+env.BlenderLib ( 'bf_sumo', sources, incs, [], libtype=['game2','player'], priority=[40, 55] , compileflags=cflags)
index 91c5101..dff4c0f 100644 (file)
@@ -5,4 +5,4 @@ sources = 'PHY_IMotionState.cpp PHY_IPhysicsController.cpp PHY_IPhysicsEnvironme
 
 incs = '. ../Dummy #intern/moto/include'
 
-env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 35, 95] )
+env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 45, 90] )
index 039bc3d..b2b75ec 100644 (file)
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp') #'RAS_GLExtensionManager.cpp RAS_ListRasterizer.cpp
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer'
 incs += ' ' + env['BF_OPENGL_INC']
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] )
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 115] )
index 2097540..62325bc 100644 (file)
@@ -8,6 +8,6 @@ incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
 if env['OURPLATFORM']=='win32-vc':
        cflags = []
        cflags.append('/Ox')
-       env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], compileflags = cflags )
+       env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,110], compileflags = cflags )
 else:
-       env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115] )
+       env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,110] )
index c2750d1..3578e74 100644 (file)
@@ -2,26 +2,26 @@
 Import ('env')
 
 SConscript(['BlenderRoutines/SConscript',
-            'Converter/SConscript',
-            'Expressions/SConscript',
-            'GameLogic/SConscript',
-            'Ketsji/SConscript',
-            'Ketsji/KXNetwork/SConscript',
-            'Network/SConscript',
-            'Network/LoopBackNetwork/SConscript',
-            'Physics/common/SConscript',
-            'Physics/Dummy/SConscript',
-            'Rasterizer/SConscript',
-            'Rasterizer/RAS_OpenGLRasterizer/SConscript',
-            'SceneGraph/SConscript',
-            'Physics/Bullet/SConscript',
-            'Physics/Sumo/SConscript'
-            ])
+                       'Converter/SConscript',
+                       'Expressions/SConscript',
+                       'GameLogic/SConscript',
+                       'Ketsji/SConscript',
+                       'Ketsji/KXNetwork/SConscript',
+                       'Network/SConscript',
+                       'Network/LoopBackNetwork/SConscript',
+                       'Physics/common/SConscript',
+                       'Physics/Dummy/SConscript',
+                       'Rasterizer/SConscript',
+                       'Rasterizer/RAS_OpenGLRasterizer/SConscript',
+                       'SceneGraph/SConscript',
+                       'Physics/Bullet/SConscript',
+                       'Physics/Sumo/SConscript'
+                       ])
 
 if env['WITH_BF_PLAYER']:
-    SConscript(['GamePlayer/SConscript'])
+       SConscript(['GamePlayer/SConscript'])
 
 #if user_options_dict['USE_PHYSICS'] == 'solid':
-#    SConscript(['Physics/Sumo/SConscript'])
+#      SConscript(['Physics/Sumo/SConscript'])
 #elif user_options_dict['USE_PHYSICS'] == 'ode':
-#    SConscript(['Physics/BlOde/SConscript'])
+#      SConscript(['Physics/BlOde/SConscript'])
index 23c1c24..90559e4 100644 (file)
@@ -6,4 +6,4 @@ sources = env.Glob('*.cpp') #'SG_BBox.cpp SG_Controller.cpp SG_IObject.cpp SG_No
 
 incs = '. #intern/moto/include'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['game','player'], priority=[50,130] )
+env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), [], libtype=['game','player'], priority=[50,125] )
index 9e678c0..dd883e1 100644 (file)
@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include'
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 150] )
+env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 140] )