[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16594] branches/sim_physics: svn merge -r 16490:16592 https://svn.blender.org/svnroot/bf-blender/trunk/ blender + 16453:16485

Daniel Genrich daniel.genrich at gmx.net
Thu Sep 18 15:23:03 CEST 2008 

Revision: 16594
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16594
Author:   genscher
Date:     2008-09-18 15:22:17 +0200 (Thu, 18 Sep 2008)

Log Message:
-----------
svn merge -r 16490:16592 https://svn.blender.org/svnroot/bf-blender/trunk/blender + 16453:16485

Modified Paths:
--------------
    branches/sim_physics/SConstruct
    branches/sim_physics/blenderplayer/CMakeLists.txt
    branches/sim_physics/config/darwin-config.py
    branches/sim_physics/config/linux2-config.py
    branches/sim_physics/config/linuxcross-config.py
    branches/sim_physics/config/openbsd3-config.py
    branches/sim_physics/config/sunos5-config.py
    branches/sim_physics/config/win32-mingw-config.py
    branches/sim_physics/config/win32-vc-config.py
    branches/sim_physics/extern/bullet2/CMakeLists.txt
    branches/sim_physics/extern/bullet2/Makefile
    branches/sim_physics/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CMakeLists.txt
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/CMakeLists.txt
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
    branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
    branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBody.h
    branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
    branches/sim_physics/extern/bullet2/src/CMakeLists.txt
    branches/sim_physics/extern/bullet2/src/LinearMath/CMakeLists.txt
    branches/sim_physics/extern/bullet2/src/LinearMath/btAabbUtil2.h
    branches/sim_physics/extern/bullet2/src/LinearMath/btMatrix3x3.h
    branches/sim_physics/extern/bullet2/src/LinearMath/btScalar.h
    branches/sim_physics/extern/bullet2/src/Makefile
    branches/sim_physics/extern/bullet2/src/SConscript
    branches/sim_physics/extern/bullet2/src/btBulletCollisionCommon.h
    branches/sim_physics/extern/bullet2/src/btBulletDynamicsCommon.h
    branches/sim_physics/intern/SoundSystem/SoundDefines.h
    branches/sim_physics/intern/SoundSystem/openal/SND_OpenALDevice.cpp
    branches/sim_physics/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/sim_physics/intern/ghost/intern/GHOST_SystemX11.h
    branches/sim_physics/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/sim_physics/intern/ghost/intern/GHOST_WindowX11.h
    branches/sim_physics/intern/iksolver/CMakeLists.txt
    branches/sim_physics/intern/iksolver/SConscript
    branches/sim_physics/projectfiles_vc7/blender/blender.vcproj
    branches/sim_physics/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/sim_physics/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/sim_physics/release/scripts/export_obj.py
    branches/sim_physics/release/scripts/import_obj.py
    branches/sim_physics/source/Makefile
    branches/sim_physics/source/blender/blenkernel/BKE_action.h
    branches/sim_physics/source/blender/blenkernel/BKE_blender.h
    branches/sim_physics/source/blender/blenkernel/BKE_particle.h
    branches/sim_physics/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/sim_physics/source/blender/blenkernel/intern/action.c
    branches/sim_physics/source/blender/blenkernel/intern/depsgraph.c
    branches/sim_physics/source/blender/blenkernel/intern/effect.c
    branches/sim_physics/source/blender/blenkernel/intern/group.c
    branches/sim_physics/source/blender/blenkernel/intern/object.c
    branches/sim_physics/source/blender/blenkernel/intern/particle.c
    branches/sim_physics/source/blender/blenkernel/intern/particle_system.c
    branches/sim_physics/source/blender/blenkernel/intern/shrinkwrap.c
    branches/sim_physics/source/blender/blenlib/BLI_blenlib.h
    branches/sim_physics/source/blender/blenlib/BLI_kdopbvh.h
    branches/sim_physics/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/sim_physics/source/blender/blenlib/intern/util.c
    branches/sim_physics/source/blender/blenloader/intern/readfile.c
    branches/sim_physics/source/blender/gpu/intern/gpu_codegen.c
    branches/sim_physics/source/blender/gpu/intern/gpu_draw.c
    branches/sim_physics/source/blender/gpu/intern/gpu_extensions.c
    branches/sim_physics/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
    branches/sim_physics/source/blender/include/BSE_editipo.h
    branches/sim_physics/source/blender/makesdna/DNA_action_types.h
    branches/sim_physics/source/blender/makesdna/DNA_object_types.h
    branches/sim_physics/source/blender/makesdna/DNA_particle_types.h
    branches/sim_physics/source/blender/makesdna/DNA_userdef_types.h
    branches/sim_physics/source/blender/python/BPY_extern.h
    branches/sim_physics/source/blender/python/BPY_interface.c
    branches/sim_physics/source/blender/python/api2_2x/BGL.h
    branches/sim_physics/source/blender/python/api2_2x/Camera.c
    branches/sim_physics/source/blender/python/api2_2x/Constraint.c
    branches/sim_physics/source/blender/python/api2_2x/Draw.c
    branches/sim_physics/source/blender/python/api2_2x/Ipo.c
    branches/sim_physics/source/blender/python/api2_2x/Ipocurve.c
    branches/sim_physics/source/blender/python/api2_2x/Lamp.c
    branches/sim_physics/source/blender/python/api2_2x/Material.c
    branches/sim_physics/source/blender/python/api2_2x/Modifier.c
    branches/sim_physics/source/blender/python/api2_2x/Object.c
    branches/sim_physics/source/blender/python/api2_2x/Pose.c
    branches/sim_physics/source/blender/python/api2_2x/Texture.c
    branches/sim_physics/source/blender/python/api2_2x/Window.c
    branches/sim_physics/source/blender/python/api2_2x/World.c
    branches/sim_physics/source/blender/python/api2_2x/bpy_data.c
    branches/sim_physics/source/blender/python/api2_2x/doc/Modifier.py
    branches/sim_physics/source/blender/src/buttons_logic.c
    branches/sim_physics/source/blender/src/buttons_object.c
    branches/sim_physics/source/blender/src/buttons_scene.c
    branches/sim_physics/source/blender/src/drawaction.c
    branches/sim_physics/source/blender/src/drawipo.c
    branches/sim_physics/source/blender/src/drawobject.c
    branches/sim_physics/source/blender/src/editaction.c
    branches/sim_physics/source/blender/src/editipo.c
    branches/sim_physics/source/blender/src/editkey.c
    branches/sim_physics/source/blender/src/editmesh_add.c
    branches/sim_physics/source/blender/src/editmesh_lib.c
    branches/sim_physics/source/blender/src/editobject.c
    branches/sim_physics/source/blender/src/editscreen.c
    branches/sim_physics/source/blender/src/editview.c
    branches/sim_physics/source/blender/src/filesel.c
    branches/sim_physics/source/blender/src/header_text.c
    branches/sim_physics/source/blender/src/header_view3d.c
    branches/sim_physics/source/blender/src/outliner.c
    branches/sim_physics/source/blender/src/poselib.c
    branches/sim_physics/source/blender/src/poseobject.c
    branches/sim_physics/source/blender/src/space.c
    branches/sim_physics/source/blender/src/toets.c
    branches/sim_physics/source/blender/src/toolbox.c
    branches/sim_physics/source/blender/src/transform_conversions.c
    branches/sim_physics/source/blender/src/transform_snap.c
    branches/sim_physics/source/creator/CMakeLists.txt
    branches/sim_physics/source/creator/creator.c
    branches/sim_physics/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ArmatureObject.h
    branches/sim_physics/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/sim_physics/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/sim_physics/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/sim_physics/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/sim_physics/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/sim_physics/source/gameengine/Converter/KX_ConvertSensors.h
    branches/sim_physics/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/sim_physics/source/gameengine/GamePlayer/ghost/Makefile
    branches/sim_physics/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/sim_physics/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/sim_physics/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/sim_physics/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/sim_physics/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/sim_physics/source/gameengine/PyDoc/Rasterizer.py
    branches/sim_physics/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/sim_physics/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/sim_physics/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/sim_physics/tools/Blender.py
    branches/sim_physics/tools/btools.py

Added Paths:
-----------
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    branches/sim_physics/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
    branches/sim_physics/extern/bullet2/src/LinearMath/btConvexHull.cpp
    branches/sim_physics/extern/bullet2/src/LinearMath/btHashMap.h
    branches/sim_physics/source/blender/include/BIF_keyframing.h
    branches/sim_physics/source/blender/src/keyframing.c

Removed Paths:
-------------
    branches/sim_physics/extern/bullet2/bullet_compound_raycast.patch
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeContactJoint.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeContactJoint.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeJoint.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeJoint.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeMacros.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeSolverBody.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeTypedJoint.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btOdeTypedJoint.h
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSorLcp.cpp
    branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSorLcp.h

Modified: branches/sim_physics/SConstruct
===================================================================
--- branches/sim_physics/SConstruct	2008-09-18 11:49:57 UTC (rev 16593)
+++ branches/sim_physics/SConstruct	2008-09-18 13:22:17 UTC (rev 16594)
@@ -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/sim_physics/blenderplayer/CMakeLists.txt
===================================================================
--- branches/sim_physics/blenderplayer/CMakeLists.txt	2008-09-18 11:49:57 UTC (rev 16593)
+++ branches/sim_physics/blenderplayer/CMakeLists.txt	2008-09-18 13:22:17 UTC (rev 16594)
@@ -86,6 +86,7 @@
     bf_oglrasterizer 
     bf_expressions 
     bf_scenegraph 
+	bf_IK
     bf_moto 
     bf_soundsystem 
     bf_kernel 

Modified: branches/sim_physics/config/darwin-config.py
===================================================================
--- branches/sim_physics/config/darwin-config.py	2008-09-18 11:49:57 UTC (rev 16593)
+++ branches/sim_physics/config/darwin-config.py	2008-09-18 13:22:17 UTC (rev 16594)
@@ -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/sim_physics/config/linux2-config.py
===================================================================
--- branches/sim_physics/config/linux2-config.py	2008-09-18 11:49:57 UTC (rev 16593)
+++ branches/sim_physics/config/linux2-config.py	2008-09-18 13:22:17 UTC (rev 16594)
@@ -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/sim_physics/config/linuxcross-config.py
===================================================================
--- branches/sim_physics/config/linuxcross-config.py	2008-09-18 11:49:57 UTC (rev 16593)
+++ branches/sim_physics/config/linuxcross-config.py	2008-09-18 13:22:17 UTC (rev 16594)
@@ -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/sim_physics/config/openbsd3-config.py
===================================================================
--- branches/sim_physics/config/openbsd3-config.py	2008-09-18 11:49:57 UTC (rev 16593)
+++ branches/sim_physics/config/openbsd3-config.py	2008-09-18 13:22:17 UTC (rev 16594)
@@ -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/sim_physics/config/sunos5-config.py
===================================================================
--- branches/sim_physics/config/sunos5-config.py	2008-09-18 11:49:57 UTC (rev 16593)
+++ branches/sim_physics/config/sunos5-config.py	2008-09-18 13:22:17 UTC (rev 16594)
@@ -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.
+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'
 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list