[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32547] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31926 :32200
Nicholas Bishop
nicholasbishop at gmail.com
Mon Oct 18 03:10:36 CEST 2010
Revision: 32547
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32547
Author: nicholasbishop
Date: 2010-10-18 03:10:35 +0200 (Mon, 18 Oct 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31926:32200
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/SConstruct
branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py
branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
branches/soc-2010-nicolasbishop/extern/binreloc/CMakeLists.txt
branches/soc-2010-nicolasbishop/extern/glew/CMakeLists.txt
branches/soc-2010-nicolasbishop/extern/libopenjpeg/CMakeLists.txt
branches/soc-2010-nicolasbishop/extern/lzo/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/boolop/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/bsp/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/container/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/decimation/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/elbeem/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/ghost/GHOST_Types.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_Debug.h
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-nicolasbishop/intern/guardedalloc/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/iksolver/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/itasc/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/memutil/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/moto/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/opennl/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/string/CMakeLists.txt
branches/soc-2010-nicolasbishop/release/bin/blender-thumbnailer.py
branches/soc-2010-nicolasbishop/release/getversion.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/master.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/slave.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/utils.py
branches/soc-2010-nicolasbishop/release/scripts/keyingsets/keyingsets_builtins.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_types.py
branches/soc-2010-nicolasbishop/release/scripts/modules/io_utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/eye_balls.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/mouth.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/shape_key_control.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/shape_key_distance.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/tail_control.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_info.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-nicolasbishop/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-nicolasbishop/release/scripts/op/image.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/import_bvh.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/export_ply.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/export_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/export_obj.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_x3d/export_x3d.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/object.py
branches/soc-2010-nicolasbishop/release/scripts/op/object_randomize_transform.py
branches/soc-2010-nicolasbishop/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2010-nicolasbishop/release/scripts/op/sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/op/uv.py
branches/soc-2010-nicolasbishop/release/scripts/op/wm.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_camera.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_scene.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_filebrowser.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_info.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/release/test/rna_info_dump.py
branches/soc-2010-nicolasbishop/release/text/readme.html
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_context.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_exotic.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_image.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_unit.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/armature.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/boids.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/context.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/curve.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/displist.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/effect.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/exotic.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/font.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/unit.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_editVert.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_base.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_color.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_storage.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/bpath.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/dynlib.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/fileops.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_color.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_matrix.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_rotation.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_vector.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/storage.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/winstuff.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-nicolasbishop/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_filter.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_markers.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/drivers.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframes_general.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframing.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/armature_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/armature/armature_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editfont.c
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_armature.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_screen.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_screen_types.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_interface.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_anim.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_layout.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/loopcut.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/meshtools.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_bake.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_constraint.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_modifier.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_vgroup.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_shading.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/screen/area.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-nicolasbishop/source/blender/editors/sound/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/console_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/console_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/space_console.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_panels.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filelist.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filelist.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filesel.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/fsmenu.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/space_file.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/drawnode.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/space_text.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_time/space_time.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_snap.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-nicolasbishop/source/blender/gpu/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/bmp.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dds/dds_api.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/filetype.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/iris.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/jp2.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/jpeg.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/module.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/openexr/openexr_api.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/png.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/readimage.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/scaling.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/targa.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/tiff.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_boid_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_object_force.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ID.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_camera.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-nicolasbishop/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/bpy_internal_import.h
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/py_capi_utils.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/py_capi_utils.h
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_array.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_interface.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_operator.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.h
branches/soc-2010-nicolasbishop/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2010-nicolasbishop/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2010-nicolasbishop/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2010-nicolasbishop/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/soc-2010-nicolasbishop/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pointdensity.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/rendercore.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/renderdatabase.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/texture.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_api.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_types.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/wm_event_types.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/wm_window.h
branches/soc-2010-nicolasbishop/source/blenderplayer/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/creator/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/creator/creator.c
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/KX_BlenderSystem.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/soc-2010-nicolasbishop/source/gameengine/Expressions/Value.h
branches/soc-2010-nicolasbishop/source/gameengine/Expressions/VectorValue.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_MouseManager.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_TimeLogger.h
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/RAS_Polygon.cpp
Removed Paths:
-------------
branches/soc-2010-nicolasbishop/projectfiles/
branches/soc-2010-nicolasbishop/projectfiles_vc7/
branches/soc-2010-nicolasbishop/projectfiles_vc9/
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-10-18 00:46:41 UTC (rev 32546)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-10-18 01:10:35 UTC (rev 32547)
@@ -315,7 +315,7 @@
ENDIF(WITH_OPENMP)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
+ SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -364,15 +364,6 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
- IF(WITH_PYTHON)
- SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_VERSION 3.1)
- SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
- # SET(PYTHON_BINARY python) # not used yet
- SET(PYTHON_LIB python31)
- SET(PYTHON_LIBPATH ${PYTHON}/lib)
- ENDIF(WITH_PYTHON)
-
IF(WITH_OPENAL)
SET(OPENAL ${LIBDIR}/openal)
SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
@@ -529,6 +520,15 @@
SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
# MSVC only, Mingw doesnt need
IF(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
@@ -540,19 +540,12 @@
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+ SET(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
- SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
- SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
+ # Better warnings
+ SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
+ SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
- SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
- SET(CMAKE_CXX_FLAGS_RELEASE " -O2" CACHE STRING "Mingw release C++ flags ")
- SET(CMAKE_CXX_FLAGS_MINSIZEREL " -Os" CACHE STRING "Mingw minsize release C++ flags ")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
-
- SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C flags ")
- SET(CMAKE_C_FLAGS_RELEASE "-O2" CACHE STRING "Mingw release C flags ")
- SET(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE STRING "Mingw minsize release C flags ")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
ADD_DEFINITIONS(-DFREE_WINDOWS)
IF(WITH_OPENMP)
@@ -616,6 +609,9 @@
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+
+ # TODO, gives linking errors, force off
+ SET(WITH_IMAGE_OPENEXR OFF)
ENDIF(WITH_IMAGE_OPENEXR)
IF(WITH_IMAGE_TIFF)
@@ -635,6 +631,15 @@
SET(WITH_JACK OFF)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31mw)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
ENDIF(MSVC)
ENDIF(WIN32)
Modified: branches/soc-2010-nicolasbishop/SConstruct
===================================================================
--- branches/soc-2010-nicolasbishop/SConstruct 2010-10-18 00:46:41 UTC (rev 32546)
+++ branches/soc-2010-nicolasbishop/SConstruct 2010-10-18 01:10:35 UTC (rev 32547)
@@ -492,6 +492,9 @@
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
+ # To ensure empty dirs are created too
+ if len(source)==0:
+ env.Execute(Mkdir(dir))
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
Modified: branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py 2010-10-18 00:46:41 UTC (rev 32546)
+++ branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py 2010-10-18 01:10:35 UTC (rev 32547)
@@ -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-2010-nicolasbishop/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py 2010-10-18 00:46:41 UTC (rev 32546)
+++ branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py 2010-10-18 01:10:35 UTC (rev 32547)
@@ -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-2010-nicolasbishop/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/extern/binreloc/CMakeLists.txt 2010-10-18 00:46:41 UTC (rev 32546)
+++ branches/soc-2010-nicolasbishop/extern/binreloc/CMakeLists.txt 2010-10-18 01:10:35 UTC (rev 32547)
@@ -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-2010-nicolasbishop/extern/glew/CMakeLists.txt
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list