[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32125] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 32124.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sat Sep 25 23:03:16 CEST 2010 

Revision: 32125
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32125
Author:   kjym3
Date:     2010-09-25 23:03:16 +0200 (Sat, 25 Sep 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 32124.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32124

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/extern/binreloc/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/boolop/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/bsp/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/decimation/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/guardedalloc/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/iksolver/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/itasc/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/memutil/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/moto/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/opennl/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/string/CMakeLists.txt
    branches/soc-2008-mxcurioni/release/bin/blender-thumbnailer.py
    branches/soc-2008-mxcurioni/release/getversion.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
    branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_builtins.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_balls.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/mouth.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/shape_key_control.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/shape_key_distance.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/shape_key_rotdiff.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rigify/tail_control.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
    branches/soc-2008-mxcurioni/release/scripts/op/fcurve_euler_filter.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/import_bvh.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_mesh_ply/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_mesh_ply/export_ply.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/export_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/export_fbx.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/export_obj.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/import_obj.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_x3d/export_x3d.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/object.py
    branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
    branches/soc-2008-mxcurioni/release/scripts/op/screen_play_rendered_anim.py
    branches/soc-2008-mxcurioni/release/scripts/op/sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_filebrowser.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/release/test/rna_info_dump.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenpluginapi/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen_types.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_api/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_sound/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vfont_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_array.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_render_ext.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2010-09-25 21:03:16 UTC (rev 32125)
@@ -129,8 +129,8 @@
     libincs.extend([
         lenv['BF_OPENGL_LIBPATH'],
         lenv['BF_JPEG_LIBPATH'],
+        lenv['BF_ZLIB_LIBPATH'],
         lenv['BF_PNG_LIBPATH'],
-        lenv['BF_ZLIB_LIBPATH'],
         lenv['BF_LIBSAMPLERATE_LIBPATH'],
         lenv['BF_ICONV_LIBPATH']
         ])
@@ -152,6 +152,10 @@
         libincs += Split(lenv['BF_LCMS_LIBPATH'])
     if lenv['WITH_BF_TIFF']:
         libincs += Split(lenv['BF_TIFF_LIBPATH'])
+        if lenv['WITH_BF_STATICTIFF']:
+            statlibs += Split(lenv['BF_TIFF_LIB_STATIC'])
+    if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
+        statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
     if lenv['WITH_BF_FFTW3']:
         libincs += Split(lenv['BF_FFTW3_LIBPATH'])
     if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']:
@@ -198,7 +202,6 @@
         
         lenv['BF_JPEG_LIB'],
         lenv['BF_PNG_LIB'],
-        lenv['BF_ZLIB_LIB'],
         lenv['BF_LIBSAMPLERATE_LIB']
         ]
 
@@ -221,11 +224,12 @@
             syslibs += ['gomp']
     if lenv['WITH_BF_ICONV']:
         syslibs += Split(lenv['BF_ICONV_LIB'])
-    if lenv['WITH_BF_OPENEXR']:
-        if not lenv['WITH_BF_STATICOPENEXR']:
-            syslibs += Split(lenv['BF_OPENEXR_LIB'])
-    if lenv['WITH_BF_TIFF']:
-            syslibs += Split(lenv['BF_TIFF_LIB'])
+    if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']:
+        syslibs += Split(lenv['BF_OPENEXR_LIB'])
+    if lenv['WITH_BF_TIFF'] and not lenv['WITH_BF_STATICTIFF']:
+        syslibs += Split(lenv['BF_TIFF_LIB'])
+    if lenv['WITH_BF_ZLIB'] and not lenv['WITH_BF_STATICZLIB']:
+        syslibs += Split(lenv['BF_ZLIB_LIB'])
     if lenv['WITH_BF_FFMPEG'] and not lenv['WITH_BF_STATICFFMPEG']:
         syslibs += Split(lenv['BF_FFMPEG_LIB'])
         if lenv['WITH_BF_OGG']:

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2010-09-25 21:03:16 UTC (rev 32125)
@@ -15,8 +15,16 @@
 Variables = SCons.Variables
 BoolVariable = SCons.Variables.BoolVariable
 
-VERSION = '2.54' # This is used in creating the local config directories
+def get_version():
+    fname = os.path.join(os.path.dirname(__file__), "..", "..", "..", "source", "blender", "blenkernel", "BKE_blender.h")
+    for l in open(fname, "r"):
+        if "BLENDER_VERSION" in l:
+            ver = int(l.split()[-1])
+            return "%d.%d" % (ver / 100, ver % 100)
+    raise Exception("%s: missing version string" % fname)
 
+VERSION = get_version() # This is used in creating the local config directories
+
 def print_arguments(args, bc):
     if len(args):
         for k,v in args.iteritems():
@@ -44,8 +52,8 @@
             'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
             'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
             'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH',
-            'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH',
-            'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH',
+            'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', 'WITH_BF_STATICTIFF', 'BF_TIFF_LIB_STATIC',
+            'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', 'WITH_BF_STATICZLIB', 'BF_ZLIB_LIB_STATIC',
             'WITH_BF_INTERNATIONAL',
             'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
             'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
@@ -270,10 +278,12 @@
         ('BF_PNG_LIBPATH', 'PNG library path', ''),
 
         (BoolVariable('WITH_BF_TIFF', 'Use TIFF if true', True)),
+        (BoolVariable('WITH_BF_STATICTIFF', 'Staticly link to TIFF', False)),
         ('BF_TIFF', 'TIFF base path', ''),
         ('BF_TIFF_INC', 'TIFF include path', ''),
         ('BF_TIFF_LIB', 'TIFF library', ''),
         ('BF_TIFF_LIBPATH', 'TIFF library path', ''),
+        ('BF_TIFF_LIB_STATIC', 'TIFF static library', ''),
 
         (BoolVariable('WITH_BF_LCMS', 'Enable color correction with lcms', False)),
         ('BF_LCMS', 'LCMS base path', ''),
@@ -282,10 +292,12 @@
         ('BF_LCMS_LIBPATH', 'LCMS library path', ''),
 
         (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)),
+        (BoolVariable('WITH_BF_STATICZLIB', 'Staticly link to ZLib', False)),
         ('BF_ZLIB', 'ZLib base path', ''),
         ('BF_ZLIB_INC', 'ZLib include path', ''),
         ('BF_ZLIB_LIB', 'ZLib library', ''),
         ('BF_ZLIB_LIBPATH', 'ZLib library path', ''),
+        ('BF_ZLIB_LIB_STATIC', 'ZLib static library', ''),
 
         (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Gettext if true', True)),
 

Modified: branches/soc-2008-mxcurioni/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/binreloc/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/extern/binreloc/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -18,8 +18,15 @@
 # All rights reserved.
 #
 
-SET(INC ./include )
+SET(SRC
+	binreloc.c
+)
+
+SET(INC
+	./include
+)
+
 ADD_DEFINITIONS(-DENABLE_BINRELOC)
-FILE(GLOB SRC *.c)
 
+
 BLENDERLIB(extern_binreloc "${SRC}" "${INC}")

Modified: branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -24,7 +24,9 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC include src)
+SET(INC
+	./include
+)
 
 IF(UNIX)
 	LIST(APPEND INC ${X11_X11_INCLUDE_PATH})

Modified: branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -25,10 +25,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 SET(INC include)
+SET(SRC minilzo/minilzo.c)
 
-FILE(GLOB SRC minilzo/*.c)
-
-
-
 BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )

Modified: branches/soc-2008-mxcurioni/intern/boolop/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/intern/boolop/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -24,9 +24,18 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . intern extern ../moto/include ../container ../memutil ../../source/blender/makesdna ../guardedalloc ../../source/blender/blenlib)
+SET(INC	
+	.
+	./intern
+	./extern
+	../memutil
+	../container
+	../guardedalloc
+	../moto/include
+	../../source/blender/blenlib
+	../../source/blender/makesdna
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
-#, libtype='common', priority=5 )

Modified: branches/soc-2008-mxcurioni/intern/bsp/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/intern/bsp/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -24,9 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC intern ../container ../moto/include ../memutil)
+SET(INC
+	./intern
+	../container
+	../moto/include
+	../memutil
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
-#, libtype='core', priority=15 )

Modified: branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -29,4 +29,3 @@
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
-#, libtype=['intern'], priority = 10 )

Modified: branches/soc-2008-mxcurioni/intern/decimation/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/decimation/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/intern/decimation/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -24,9 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . ../moto/include ../container ../memutil)
+SET(INC
+	.
+	../container
+	../memutil
+	../moto/include
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
-#, libtype=['core','common','player'], priority = [10, 20, 25] )

Modified: branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -38,4 +38,3 @@
 ENDIF(WITH_OPENMP)
 
 BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
-#, libtype='blender', priority=0 )

Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/CMakeLists.txt	2010-09-25 20:19:56 UTC (rev 32124)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/CMakeLists.txt	2010-09-25 21:03:16 UTC (rev 32125)
@@ -26,12 +26,18 @@
 
 SET(INC .)
 
-FILE(GLOB SRC intern/*.c)
+SET(SRC
+	./intern/mallocn.c
+)
 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list