[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16595] branches/fluidcontrol: svn merge -r 16454:16593 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Thu Sep 18 17:01:20 CEST 2008
Revision: 16595
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16595
Author: genscher
Date: 2008-09-18 16:59:44 +0200 (Thu, 18 Sep 2008)
Log Message:
-----------
svn merge -r 16454:16593 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/fluidcontrol/SConstruct
branches/fluidcontrol/blenderplayer/CMakeLists.txt
branches/fluidcontrol/config/darwin-config.py
branches/fluidcontrol/config/linux2-config.py
branches/fluidcontrol/config/linuxcross-config.py
branches/fluidcontrol/config/openbsd3-config.py
branches/fluidcontrol/config/sunos5-config.py
branches/fluidcontrol/config/win32-mingw-config.py
branches/fluidcontrol/config/win32-vc-config.py
branches/fluidcontrol/extern/bullet2/CMakeLists.txt
branches/fluidcontrol/extern/bullet2/Makefile
branches/fluidcontrol/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
branches/fluidcontrol/extern/bullet2/readme.txt
branches/fluidcontrol/extern/bullet2/src/Bullet-C-Api.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CMakeLists.txt
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/Jamfile
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/CMakeLists.txt
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Jamfile
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
branches/fluidcontrol/extern/bullet2/src/CMakeLists.txt
branches/fluidcontrol/extern/bullet2/src/Jamfile
branches/fluidcontrol/extern/bullet2/src/LinearMath/CMakeLists.txt
branches/fluidcontrol/extern/bullet2/src/LinearMath/Jamfile
branches/fluidcontrol/extern/bullet2/src/LinearMath/btAabbUtil2.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
branches/fluidcontrol/extern/bullet2/src/LinearMath/btAlignedAllocator.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btDefaultMotionState.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
branches/fluidcontrol/extern/bullet2/src/LinearMath/btGeometryUtil.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btMatrix3x3.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btMinMax.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btMotionState.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btQuadWord.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btQuaternion.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btQuickprof.cpp
branches/fluidcontrol/extern/bullet2/src/LinearMath/btQuickprof.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btScalar.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btStackAlloc.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btTransform.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btTransformUtil.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btVector3.h
branches/fluidcontrol/extern/bullet2/src/Makefile
branches/fluidcontrol/extern/bullet2/src/SConscript
branches/fluidcontrol/extern/bullet2/src/btBulletCollisionCommon.h
branches/fluidcontrol/extern/bullet2/src/btBulletDynamicsCommon.h
branches/fluidcontrol/intern/SoundSystem/SoundDefines.h
branches/fluidcontrol/intern/SoundSystem/openal/SND_OpenALDevice.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.h
branches/fluidcontrol/intern/ghost/intern/GHOST_WindowX11.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_WindowX11.h
branches/fluidcontrol/intern/iksolver/CMakeLists.txt
branches/fluidcontrol/intern/iksolver/SConscript
branches/fluidcontrol/projectfiles_vc7/blender/blender.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/src/BL_src.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/fluidcontrol/release/scripts/bpymodules/BPyTextPlugin.py
branches/fluidcontrol/release/scripts/export_obj.py
branches/fluidcontrol/release/scripts/import_obj.py
branches/fluidcontrol/source/Makefile
branches/fluidcontrol/source/blender/blenkernel/BKE_action.h
branches/fluidcontrol/source/blender/blenkernel/BKE_blender.h
branches/fluidcontrol/source/blender/blenkernel/BKE_particle.h
branches/fluidcontrol/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/fluidcontrol/source/blender/blenkernel/intern/action.c
branches/fluidcontrol/source/blender/blenkernel/intern/anim.c
branches/fluidcontrol/source/blender/blenkernel/intern/depsgraph.c
branches/fluidcontrol/source/blender/blenkernel/intern/effect.c
branches/fluidcontrol/source/blender/blenkernel/intern/exotic.c
branches/fluidcontrol/source/blender/blenkernel/intern/group.c
branches/fluidcontrol/source/blender/blenkernel/intern/modifier.c
branches/fluidcontrol/source/blender/blenkernel/intern/node.c
branches/fluidcontrol/source/blender/blenkernel/intern/object.c
branches/fluidcontrol/source/blender/blenkernel/intern/particle.c
branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
branches/fluidcontrol/source/blender/blenkernel/intern/shrinkwrap.c
branches/fluidcontrol/source/blender/blenkernel/intern/subsurf_ccg.c
branches/fluidcontrol/source/blender/blenlib/BLI_blenlib.h
branches/fluidcontrol/source/blender/blenlib/BLI_kdopbvh.h
branches/fluidcontrol/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/fluidcontrol/source/blender/blenlib/intern/util.c
branches/fluidcontrol/source/blender/blenloader/BLO_readfile.h
branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
branches/fluidcontrol/source/blender/gpu/intern/gpu_codegen.c
branches/fluidcontrol/source/blender/gpu/intern/gpu_draw.c
branches/fluidcontrol/source/blender/gpu/intern/gpu_extensions.c
branches/fluidcontrol/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
branches/fluidcontrol/source/blender/imbuf/intern/bmp.c
branches/fluidcontrol/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/fluidcontrol/source/blender/imbuf/intern/dds/ColorBlock.h
branches/fluidcontrol/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/fluidcontrol/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/fluidcontrol/source/blender/imbuf/intern/dds/dds_api.cpp
branches/fluidcontrol/source/blender/include/BIF_editaction.h
branches/fluidcontrol/source/blender/include/BIF_glutil.h
branches/fluidcontrol/source/blender/include/BSE_editipo.h
branches/fluidcontrol/source/blender/makesdna/DNA_action_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_actuator_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_object_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_particle_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_userdef_types.h
branches/fluidcontrol/source/blender/python/BPY_extern.h
branches/fluidcontrol/source/blender/python/BPY_interface.c
branches/fluidcontrol/source/blender/python/api2_2x/BGL.h
branches/fluidcontrol/source/blender/python/api2_2x/Camera.c
branches/fluidcontrol/source/blender/python/api2_2x/Constraint.c
branches/fluidcontrol/source/blender/python/api2_2x/Draw.c
branches/fluidcontrol/source/blender/python/api2_2x/Ipo.c
branches/fluidcontrol/source/blender/python/api2_2x/Ipocurve.c
branches/fluidcontrol/source/blender/python/api2_2x/Lamp.c
branches/fluidcontrol/source/blender/python/api2_2x/MTex.c
branches/fluidcontrol/source/blender/python/api2_2x/Material.c
branches/fluidcontrol/source/blender/python/api2_2x/Modifier.c
branches/fluidcontrol/source/blender/python/api2_2x/Object.c
branches/fluidcontrol/source/blender/python/api2_2x/Pose.c
branches/fluidcontrol/source/blender/python/api2_2x/Texture.c
branches/fluidcontrol/source/blender/python/api2_2x/Window.c
branches/fluidcontrol/source/blender/python/api2_2x/World.c
branches/fluidcontrol/source/blender/python/api2_2x/bpy_data.c
branches/fluidcontrol/source/blender/python/api2_2x/doc/Material.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Mesh.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Modifier.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Texture.py
branches/fluidcontrol/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/fluidcontrol/source/blender/render/intern/source/imagetexture.c
branches/fluidcontrol/source/blender/render/intern/source/pipeline.c
branches/fluidcontrol/source/blender/src/buttons_logic.c
branches/fluidcontrol/source/blender/src/buttons_object.c
branches/fluidcontrol/source/blender/src/buttons_scene.c
branches/fluidcontrol/source/blender/src/drawaction.c
branches/fluidcontrol/source/blender/src/drawipo.c
branches/fluidcontrol/source/blender/src/drawobject.c
branches/fluidcontrol/source/blender/src/editaction.c
branches/fluidcontrol/source/blender/src/editipo.c
branches/fluidcontrol/source/blender/src/editipo_mods.c
branches/fluidcontrol/source/blender/src/editkey.c
branches/fluidcontrol/source/blender/src/editmesh_add.c
branches/fluidcontrol/source/blender/src/editmesh_lib.c
branches/fluidcontrol/source/blender/src/editmesh_tools.c
branches/fluidcontrol/source/blender/src/editobject.c
branches/fluidcontrol/source/blender/src/editscreen.c
branches/fluidcontrol/source/blender/src/editview.c
branches/fluidcontrol/source/blender/src/filesel.c
branches/fluidcontrol/source/blender/src/glutil.c
branches/fluidcontrol/source/blender/src/gpencil.c
branches/fluidcontrol/source/blender/src/header_ipo.c
branches/fluidcontrol/source/blender/src/header_text.c
branches/fluidcontrol/source/blender/src/header_view3d.c
branches/fluidcontrol/source/blender/src/mywindow.c
branches/fluidcontrol/source/blender/src/outliner.c
branches/fluidcontrol/source/blender/src/poselib.c
branches/fluidcontrol/source/blender/src/poseobject.c
branches/fluidcontrol/source/blender/src/sequence.c
branches/fluidcontrol/source/blender/src/space.c
branches/fluidcontrol/source/blender/src/toets.c
branches/fluidcontrol/source/blender/src/toolbox.c
branches/fluidcontrol/source/blender/src/transform_conversions.c
branches/fluidcontrol/source/blender/src/transform_snap.c
branches/fluidcontrol/source/blender/src/usiblender.c
branches/fluidcontrol/source/creator/CMakeLists.txt
branches/fluidcontrol/source/creator/creator.c
branches/fluidcontrol/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ActionActuator.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ArmatureObject.h
branches/fluidcontrol/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertSensors.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/Makefile
branches/fluidcontrol/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameActuator.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_PythonInit.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/fluidcontrol/source/gameengine/PyDoc/Rasterizer.py
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/fluidcontrol/tools/Blender.py
branches/fluidcontrol/tools/btools.py
Added Paths:
-----------
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
branches/fluidcontrol/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
branches/fluidcontrol/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/Jamfile
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btConvexHull.cpp
branches/fluidcontrol/extern/bullet2/src/LinearMath/btConvexHull.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btHashMap.h
branches/fluidcontrol/extern/bullet2/src/LinearMath/btPoolAllocator.h
branches/fluidcontrol/source/blender/include/BIF_keyframing.h
branches/fluidcontrol/source/blender/src/keyframing.c
Removed Paths:
-------------
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/Jamfile
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/fluidcontrol/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
Modified: branches/fluidcontrol/SConstruct
===================================================================
--- branches/fluidcontrol/SConstruct 2008-09-18 13:22:17 UTC (rev 16594)
+++ branches/fluidcontrol/SConstruct 2008-09-18 14:59:44 UTC (rev 16595)
@@ -241,6 +241,13 @@
for l in B.quickdebug:
print "\t" + l
+# remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS
+if env['WITH_BF_STATICCXX']:
+ if 'stdc++' in env['LLIBS']:
+ env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ')
+ else:
+ print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform'
+
# check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline
if 'blenderplayer' in B.targets:
env['WITH_BF_PLAYER'] = True
@@ -248,6 +255,19 @@
if 'blendernogame' in B.targets:
env['WITH_BF_GAMEENGINE'] = False
+if 'blenderlite' in B.targets:
+ env['WITH_BF_GAMEENGINE'] = False
+ env['WITH_BF_OPENAL'] = False
+ env['WITH_BF_OPENEXR'] = False
+ env['WITH_BF_ICONV'] = False
+ env['WITH_BF_INTERNATIONAL'] = False
+ env['WITH_BF_OPENJPEG'] = False
+ env['WITH_BF_FFMPEG'] = False
+ env['WITH_BF_QUICKTIME'] = False
+ env['WITH_BF_YAFRAY'] = False
+ env['WITH_BF_REDCODE'] = False
+ env['WITH_BF_FTGL'] = False
+
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
#B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
B.root_build_dir = env['BF_BUILDDIR']
@@ -488,6 +508,10 @@
blendernogame = env.Alias('blendernogame', B.program_list)
Depends(blendernogame,installtarget)
+if 'blenderlite' in B.targets:
+ blenderlite = env.Alias('blenderlite', B.program_list)
+ Depends(blenderlite,installtarget)
+
Depends(nsiscmd, allinstall)
Default(B.program_list)
Modified: branches/fluidcontrol/blenderplayer/CMakeLists.txt
===================================================================
--- branches/fluidcontrol/blenderplayer/CMakeLists.txt 2008-09-18 13:22:17 UTC (rev 16594)
+++ branches/fluidcontrol/blenderplayer/CMakeLists.txt 2008-09-18 14:59:44 UTC (rev 16595)
@@ -86,6 +86,7 @@
bf_oglrasterizer
bf_expressions
bf_scenegraph
+ bf_IK
bf_moto
bf_soundsystem
bf_kernel
Modified: branches/fluidcontrol/config/darwin-config.py
===================================================================
--- branches/fluidcontrol/config/darwin-config.py 2008-09-18 13:22:17 UTC (rev 16594)
+++ branches/fluidcontrol/config/darwin-config.py 2008-09-18 14:59:44 UTC (rev 16595)
@@ -87,11 +87,19 @@
BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
else :
BF_OPENAL = LIBDIR + '/openal'
-
+
+WITH_BF_STATICOPENAL = 'false'
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -102,10 +110,13 @@
BF_FMOD = LIBDIR + '/fmod'
WITH_BF_OPENEXR = 'true'
+WITH_BF_STATICOPENEXR = 'false'
BF_OPENEXR = '${LCGDIR}/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
WITH_BF_DDS = 'true'
Modified: branches/fluidcontrol/config/linux2-config.py
===================================================================
--- branches/fluidcontrol/config/linux2-config.py 2008-09-18 13:22:17 UTC (rev 16594)
+++ branches/fluidcontrol/config/linux2-config.py 2008-09-18 14:59:44 UTC (rev 16595)
@@ -6,19 +6,29 @@
BF_PYTHON = '/usr'
BF_PYTHON_VERSION = '2.5'
+WITH_BF_STATICPYTHON = 'false'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
WITH_BF_OPENAL = 'true'
+WITH_BF_STATICOPENAL = 'false'
BF_OPENAL = '/usr'
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
# some distros have a separate libalut
# if you get linker complaints, you need to uncomment the line below
# BF_OPENAL_LIB = 'openal alut'
+# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = '/usr' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -28,14 +38,17 @@
BF_FMOD = LIBDIR + '/fmod'
WITH_BF_OPENEXR = 'true'
+WITH_BF_STATICOPENEXR = 'false'
BF_OPENEXR = '/usr'
# when compiling with your own openexr lib you might need to set...
# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
WITH_BF_DDS = 'true'
WITH_BF_JPEG = 'true'
Modified: branches/fluidcontrol/config/linuxcross-config.py
===================================================================
--- branches/fluidcontrol/config/linuxcross-config.py 2008-09-18 13:22:17 UTC (rev 16594)
+++ branches/fluidcontrol/config/linuxcross-config.py 2008-09-18 14:59:44 UTC (rev 16595)
@@ -14,11 +14,19 @@
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = 'true'
+WITH_BF_STATICOPENAL = 'false'
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal_static'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl'
BF_SDL_INC = '${BF_SDL}/include'
@@ -34,10 +42,13 @@
BF_FMOD = LIBDIR + '/fmod'
WITH_BF_OPENEXR = 'true'
+WITH_BF_STATICOPENEXR = 'false'
BF_OPENEXR = LIBDIR + '/gcc/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Half IlmImf Iex '
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
WITH_BF_DDS = 'true'
Modified: branches/fluidcontrol/config/openbsd3-config.py
===================================================================
--- branches/fluidcontrol/config/openbsd3-config.py 2008-09-18 13:22:17 UTC (rev 16594)
+++ branches/fluidcontrol/config/openbsd3-config.py 2008-09-18 14:59:44 UTC (rev 16595)
@@ -9,10 +9,12 @@
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
WITH_BF_OPENAL = 'false'
+# WITH_BF_STATICOPENAL = 'false'
#BF_OPENAL = LIBDIR + '/openal'
#BF_OPENAL_INC = '${BF_OPENAL}/include'
#BF_OPENAL_LIB = 'openal'
#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+#BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
WITH_BF_SDL = 'true'
BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
@@ -24,9 +26,12 @@
BF_FMOD = LIBDIR + '/fmod'
WITH_BF_OPENEXR = 'false'
+WITH_BF_STATICOPENEXR = 'false'
BF_OPENEXR = '/usr/local'
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
WITH_BF_DDS = 'true'
Modified: branches/fluidcontrol/config/sunos5-config.py
===================================================================
--- branches/fluidcontrol/config/sunos5-config.py 2008-09-18 13:22:17 UTC (rev 16594)
+++ branches/fluidcontrol/config/sunos5-config.py 2008-09-18 14:59:44 UTC (rev 16595)
@@ -9,11 +9,19 @@
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
WITH_BF_OPENAL = 'true'
+WITH_BF_STATICOPENAL = 'false'
BF_OPENAL = '/usr/local'
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
BF_OPENAL_LIB = 'openal'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
WITH_BF_SDL = 'true'
BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -24,10 +32,13 @@
BF_FMOD = LIBDIR + '/fmod'
WITH_BF_OPENEXR = 'true'
+WITH_BF_STATICOPENEXR = 'false'
BF_OPENEXR = '/usr/local'
BF_OPENEXR_INC = ['${BF_OPENEXR}/include', '${BF_OPENEXR}/include/OpenEXR' ]
BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+# Warning, this static lib configuration is untested! users of this OS please confirm.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list