[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16585] branches/soc-2008-unclezeiv: svn merge -r 16504:16582 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Davide Vercelli
davide.vercelli at gmail.com
Wed Sep 17 23:21:27 CEST 2008
Revision: 16585
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16585
Author: unclezeiv
Date: 2008-09-17 23:21:27 +0200 (Wed, 17 Sep 2008)
Log Message:
-----------
svn merge -r 16504:16582 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/SConstruct
branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt
branches/soc-2008-unclezeiv/config/darwin-config.py
branches/soc-2008-unclezeiv/config/linux2-config.py
branches/soc-2008-unclezeiv/config/linuxcross-config.py
branches/soc-2008-unclezeiv/config/openbsd3-config.py
branches/soc-2008-unclezeiv/config/sunos5-config.py
branches/soc-2008-unclezeiv/config/win32-mingw-config.py
branches/soc-2008-unclezeiv/config/win32-vc-config.py
branches/soc-2008-unclezeiv/extern/bullet2/CMakeLists.txt
branches/soc-2008-unclezeiv/extern/bullet2/Makefile
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/soc-2008-unclezeiv/extern/bullet2/src/Makefile
branches/soc-2008-unclezeiv/extern/bullet2/src/SConscript
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2008-unclezeiv/intern/iksolver/CMakeLists.txt
branches/soc-2008-unclezeiv/intern/iksolver/SConscript
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2008-unclezeiv/release/scripts/export_obj.py
branches/soc-2008-unclezeiv/release/scripts/import_obj.py
branches/soc-2008-unclezeiv/source/Makefile
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_action.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/action.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/effect.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/group.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_blenlib.h
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/util.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
branches/soc-2008-unclezeiv/source/blender/include/BSE_editipo.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-unclezeiv/source/blender/python/BPY_extern.h
branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/BGL.h
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Camera.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Constraint.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Draw.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Ipo.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Ipocurve.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Lamp.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Material.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Object.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Pose.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Texture.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Window.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/World.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/bpy_data.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_logic.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
branches/soc-2008-unclezeiv/source/blender/src/drawaction.c
branches/soc-2008-unclezeiv/source/blender/src/drawipo.c
branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
branches/soc-2008-unclezeiv/source/blender/src/editaction.c
branches/soc-2008-unclezeiv/source/blender/src/editipo.c
branches/soc-2008-unclezeiv/source/blender/src/editkey.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_add.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_lib.c
branches/soc-2008-unclezeiv/source/blender/src/editobject.c
branches/soc-2008-unclezeiv/source/blender/src/editscreen.c
branches/soc-2008-unclezeiv/source/blender/src/editview.c
branches/soc-2008-unclezeiv/source/blender/src/filesel.c
branches/soc-2008-unclezeiv/source/blender/src/header_text.c
branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
branches/soc-2008-unclezeiv/source/blender/src/outliner.c
branches/soc-2008-unclezeiv/source/blender/src/poselib.c
branches/soc-2008-unclezeiv/source/blender/src/poseobject.c
branches/soc-2008-unclezeiv/source/blender/src/space.c
branches/soc-2008-unclezeiv/source/blender/src/toets.c
branches/soc-2008-unclezeiv/source/blender/src/toolbox.c
branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
branches/soc-2008-unclezeiv/source/blender/src/transform_snap.c
branches/soc-2008-unclezeiv/source/creator/CMakeLists.txt
branches/soc-2008-unclezeiv/source/creator/creator.c
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/ghost/Makefile
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-unclezeiv/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/Rasterizer.py
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-unclezeiv/tools/Blender.py
branches/soc-2008-unclezeiv/tools/btools.py
Added Paths:
-----------
branches/soc-2008-unclezeiv/extern/bullet2/src/LinearMath/btConvexHull.cpp
branches/soc-2008-unclezeiv/extern/bullet2/src/LinearMath/btHashMap.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_keyframing.h
branches/soc-2008-unclezeiv/source/blender/src/keyframing.c
Modified: branches/soc-2008-unclezeiv/SConstruct
===================================================================
--- branches/soc-2008-unclezeiv/SConstruct 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/SConstruct 2008-09-17 21:21:27 UTC (rev 16585)
@@ -248,6 +248,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 +501,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/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/blenderplayer/CMakeLists.txt 2008-09-17 21:21:27 UTC (rev 16585)
@@ -86,6 +86,7 @@
bf_oglrasterizer
bf_expressions
bf_scenegraph
+ bf_IK
bf_moto
bf_soundsystem
bf_kernel
Modified: branches/soc-2008-unclezeiv/config/darwin-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/darwin-config.py 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/config/darwin-config.py 2008-09-17 21:21:27 UTC (rev 16585)
@@ -87,10 +87,13 @@
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'
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
@@ -102,10 +105,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/soc-2008-unclezeiv/config/linux2-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/linux2-config.py 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/config/linux2-config.py 2008-09-17 21:21:27 UTC (rev 16585)
@@ -6,18 +6,24 @@
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'
WITH_BF_SDL = 'true'
BF_SDL = '/usr' #$(shell sdl-config --prefix)
@@ -28,14 +34,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/soc-2008-unclezeiv/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/linuxcross-config.py 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/config/linuxcross-config.py 2008-09-17 21:21:27 UTC (rev 16585)
@@ -14,10 +14,13 @@
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'
WITH_BF_SDL = 'true'
BF_SDL = LIBDIR + '/sdl'
@@ -34,10 +37,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/soc-2008-unclezeiv/config/openbsd3-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/openbsd3-config.py 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/config/openbsd3-config.py 2008-09-17 21:21:27 UTC (rev 16585)
@@ -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/soc-2008-unclezeiv/config/sunos5-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/sunos5-config.py 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/config/sunos5-config.py 2008-09-17 21:21:27 UTC (rev 16585)
@@ -9,10 +9,13 @@
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'
WITH_BF_SDL = 'true'
BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
@@ -24,10 +27,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'
WITH_BF_DDS = 'true'
Modified: branches/soc-2008-unclezeiv/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/win32-mingw-config.py 2008-09-17 21:20:08 UTC (rev 16584)
+++ branches/soc-2008-unclezeiv/config/win32-mingw-config.py 2008-09-17 21:21:27 UTC (rev 16585)
@@ -12,10 +12,13 @@
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 = 'dxguid 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'
WITH_BF_FFMPEG = 'false'
BF_FFMPEG_LIB = 'avformat swscale avcodec avutil xvidcore x264'
@@ -37,10 +40,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.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list