[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33438] branches/particles-2010: svn merge -r33305:33437 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Fri Dec 3 10:48:32 CET 2010
Revision: 33438
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33438
Author: lukastoenne
Date: 2010-12-03 10:48:31 +0100 (Fri, 03 Dec 2010)
Log Message:
-----------
svn merge -r33305:33437 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/build_files/scons/config/freebsd7-config.py
branches/particles-2010/build_files/scons/config/freebsd8-config.py
branches/particles-2010/build_files/scons/config/freebsd9-config.py
branches/particles-2010/doc/python_api/sphinx_doc_gen.py
branches/particles-2010/extern/CMakeLists.txt
branches/particles-2010/extern/binreloc/CMakeLists.txt
branches/particles-2010/extern/bullet2/CMakeLists.txt
branches/particles-2010/extern/glew/CMakeLists.txt
branches/particles-2010/extern/libopenjpeg/CMakeLists.txt
branches/particles-2010/extern/lzma/CMakeLists.txt
branches/particles-2010/extern/lzo/CMakeLists.txt
branches/particles-2010/intern/audaspace/CMakeLists.txt
branches/particles-2010/intern/boolop/CMakeLists.txt
branches/particles-2010/intern/boolop/intern/BOP_BSPNode.cpp
branches/particles-2010/intern/boolop/intern/BOP_BSPNode.h
branches/particles-2010/intern/bsp/CMakeLists.txt
branches/particles-2010/intern/container/CMakeLists.txt
branches/particles-2010/intern/decimation/CMakeLists.txt
branches/particles-2010/intern/elbeem/CMakeLists.txt
branches/particles-2010/intern/ghost/CMakeLists.txt
branches/particles-2010/intern/ghost/intern/GHOST_WindowX11.cpp
branches/particles-2010/intern/guardedalloc/CMakeLists.txt
branches/particles-2010/intern/guardedalloc/intern/mallocn.c
branches/particles-2010/intern/iksolver/CMakeLists.txt
branches/particles-2010/intern/itasc/CMakeLists.txt
branches/particles-2010/intern/memutil/CMakeLists.txt
branches/particles-2010/intern/moto/CMakeLists.txt
branches/particles-2010/intern/opennl/CMakeLists.txt
branches/particles-2010/intern/smoke/CMakeLists.txt
branches/particles-2010/intern/string/CMakeLists.txt
branches/particles-2010/release/Makefile
branches/particles-2010/release/datafiles/datatoc.py
branches/particles-2010/release/getversion.py
branches/particles-2010/release/scripts/modules/extensions_framework/ui.py
branches/particles-2010/release/scripts/op/console_python.py
branches/particles-2010/release/scripts/op/io_scene_fbx/export_fbx.py
branches/particles-2010/release/scripts/op/uv.py
branches/particles-2010/release/scripts/ui/properties_particle.py
branches/particles-2010/release/scripts/ui/properties_physics_common.py
branches/particles-2010/release/scripts/ui/properties_physics_smoke.py
branches/particles-2010/release/scripts/ui/properties_render.py
branches/particles-2010/release/scripts/ui/properties_texture.py
branches/particles-2010/release/scripts/ui/space_sequencer.py
branches/particles-2010/release/scripts/ui/space_userpref.py
branches/particles-2010/release/scripts/ui/space_view3d.py
branches/particles-2010/release/test/pep8.py
branches/particles-2010/source/blender/CMakeLists.txt
branches/particles-2010/source/blender/avi/CMakeLists.txt
branches/particles-2010/source/blender/blenfont/BLF_api.h
branches/particles-2010/source/blender/blenfont/CMakeLists.txt
branches/particles-2010/source/blender/blenfont/intern/blf.c
branches/particles-2010/source/blender/blenfont/intern/blf_glyph.c
branches/particles-2010/source/blender/blenfont/intern/blf_internal.h
branches/particles-2010/source/blender/blenkernel/BKE_blender.h
branches/particles-2010/source/blender/blenkernel/BKE_deform.h
branches/particles-2010/source/blender/blenkernel/BKE_fcurve.h
branches/particles-2010/source/blender/blenkernel/BKE_image.h
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/BKE_pointcache.h
branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
branches/particles-2010/source/blender/blenkernel/intern/armature.c
branches/particles-2010/source/blender/blenkernel/intern/cloth.c
branches/particles-2010/source/blender/blenkernel/intern/colortools.c
branches/particles-2010/source/blender/blenkernel/intern/constraint.c
branches/particles-2010/source/blender/blenkernel/intern/deform.c
branches/particles-2010/source/blender/blenkernel/intern/font.c
branches/particles-2010/source/blender/blenkernel/intern/image.c
branches/particles-2010/source/blender/blenkernel/intern/image_gen.c
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenkernel/intern/particle.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
branches/particles-2010/source/blender/blenkernel/intern/sequencer.c
branches/particles-2010/source/blender/blenkernel/intern/smoke.c
branches/particles-2010/source/blender/blenlib/BLI_math_rotation.h
branches/particles-2010/source/blender/blenlib/BLI_math_vector.h
branches/particles-2010/source/blender/blenlib/BLI_string.h
branches/particles-2010/source/blender/blenlib/CMakeLists.txt
branches/particles-2010/source/blender/blenlib/intern/graph.c
branches/particles-2010/source/blender/blenlib/intern/math_geom.c
branches/particles-2010/source/blender/blenlib/intern/math_vector_inline.c
branches/particles-2010/source/blender/blenlib/intern/scanfill.c
branches/particles-2010/source/blender/blenloader/CMakeLists.txt
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/blenpluginapi/CMakeLists.txt
branches/particles-2010/source/blender/collada/CMakeLists.txt
branches/particles-2010/source/blender/editors/animation/CMakeLists.txt
branches/particles-2010/source/blender/editors/animation/anim_channels_edit.c
branches/particles-2010/source/blender/editors/animation/anim_filter.c
branches/particles-2010/source/blender/editors/animation/anim_ops.c
branches/particles-2010/source/blender/editors/animation/keyframing.c
branches/particles-2010/source/blender/editors/armature/CMakeLists.txt
branches/particles-2010/source/blender/editors/armature/editarmature.c
branches/particles-2010/source/blender/editors/armature/editarmature_generate.c
branches/particles-2010/source/blender/editors/armature/editarmature_retarget.c
branches/particles-2010/source/blender/editors/armature/poseobject.c
branches/particles-2010/source/blender/editors/armature/reeb.c
branches/particles-2010/source/blender/editors/curve/CMakeLists.txt
branches/particles-2010/source/blender/editors/curve/curve_intern.h
branches/particles-2010/source/blender/editors/curve/editcurve.c
branches/particles-2010/source/blender/editors/curve/editfont.c
branches/particles-2010/source/blender/editors/curve/lorem.c
branches/particles-2010/source/blender/editors/datafiles/Bfont.c
branches/particles-2010/source/blender/editors/datafiles/startup.blend.c
branches/particles-2010/source/blender/editors/gpencil/CMakeLists.txt
branches/particles-2010/source/blender/editors/include/ED_anim_api.h
branches/particles-2010/source/blender/editors/include/ED_armature.h
branches/particles-2010/source/blender/editors/include/ED_curve.h
branches/particles-2010/source/blender/editors/include/ED_keyframes_edit.h
branches/particles-2010/source/blender/editors/include/ED_view3d.h
branches/particles-2010/source/blender/editors/include/UI_interface.h
branches/particles-2010/source/blender/editors/include/UI_view2d.h
branches/particles-2010/source/blender/editors/interface/CMakeLists.txt
branches/particles-2010/source/blender/editors/interface/interface.c
branches/particles-2010/source/blender/editors/interface/interface_draw.c
branches/particles-2010/source/blender/editors/interface/interface_handlers.c
branches/particles-2010/source/blender/editors/interface/interface_intern.h
branches/particles-2010/source/blender/editors/interface/interface_regions.c
branches/particles-2010/source/blender/editors/interface/interface_style.c
branches/particles-2010/source/blender/editors/interface/view2d.c
branches/particles-2010/source/blender/editors/interface/view2d_ops.c
branches/particles-2010/source/blender/editors/mesh/CMakeLists.txt
branches/particles-2010/source/blender/editors/mesh/editface.c
branches/particles-2010/source/blender/editors/mesh/editmesh_loop.c
branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
branches/particles-2010/source/blender/editors/metaball/CMakeLists.txt
branches/particles-2010/source/blender/editors/object/CMakeLists.txt
branches/particles-2010/source/blender/editors/object/object_relations.c
branches/particles-2010/source/blender/editors/physics/CMakeLists.txt
branches/particles-2010/source/blender/editors/physics/particle_edit.c
branches/particles-2010/source/blender/editors/render/CMakeLists.txt
branches/particles-2010/source/blender/editors/render/render_preview.c
branches/particles-2010/source/blender/editors/screen/CMakeLists.txt
branches/particles-2010/source/blender/editors/screen/screen_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
branches/particles-2010/source/blender/editors/sound/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_action/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_action/action_select.c
branches/particles-2010/source/blender/editors/space_buttons/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_console/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_console/console_draw.c
branches/particles-2010/source/blender/editors/space_console/console_intern.h
branches/particles-2010/source/blender/editors/space_console/console_ops.c
branches/particles-2010/source/blender/editors/space_console/space_console.c
branches/particles-2010/source/blender/editors/space_file/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_file/file_draw.c
branches/particles-2010/source/blender/editors/space_graph/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_image/Makefile
branches/particles-2010/source/blender/editors/space_image/SConscript
branches/particles-2010/source/blender/editors/space_image/image_draw.c
branches/particles-2010/source/blender/editors/space_image/image_ops.c
branches/particles-2010/source/blender/editors/space_info/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_info/info_draw.c
branches/particles-2010/source/blender/editors/space_info/info_intern.h
branches/particles-2010/source/blender/editors/space_info/info_ops.c
branches/particles-2010/source/blender/editors/space_info/info_report.c
branches/particles-2010/source/blender/editors/space_info/textview.c
branches/particles-2010/source/blender/editors/space_info/textview.h
branches/particles-2010/source/blender/editors/space_logic/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_logic/logic_window.c
branches/particles-2010/source/blender/editors/space_nla/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_nla/nla_intern.h
branches/particles-2010/source/blender/editors/space_node/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/editors/space_outliner/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_outliner/space_outliner.c
branches/particles-2010/source/blender/editors/space_script/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_sequencer/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_add.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
branches/particles-2010/source/blender/editors/space_sound/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_text/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_text/text_draw.c
branches/particles-2010/source/blender/editors/space_time/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_userpref/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_view3d/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_view3d/drawmesh.c
branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_intern.h
branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
branches/particles-2010/source/blender/editors/transform/CMakeLists.txt
branches/particles-2010/source/blender/editors/transform/transform.c
branches/particles-2010/source/blender/editors/transform/transform_constraints.c
branches/particles-2010/source/blender/editors/transform/transform_generics.c
branches/particles-2010/source/blender/editors/transform/transform_manipulator.c
branches/particles-2010/source/blender/editors/transform/transform_ops.c
branches/particles-2010/source/blender/editors/util/CMakeLists.txt
branches/particles-2010/source/blender/editors/util/undo.c
branches/particles-2010/source/blender/editors/uvedit/CMakeLists.txt
branches/particles-2010/source/blender/gpu/CMakeLists.txt
branches/particles-2010/source/blender/gpu/intern/gpu_buffers.c
branches/particles-2010/source/blender/gpu/intern/gpu_draw.c
branches/particles-2010/source/blender/gpu/intern/gpu_extensions.c
branches/particles-2010/source/blender/ikplugin/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/IMB_imbuf.h
branches/particles-2010/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/particles-2010/source/blender/imbuf/intern/divers.c
branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/particles-2010/source/blender/imbuf/intern/png.c
branches/particles-2010/source/blender/imbuf/intern/util.c
branches/particles-2010/source/blender/makesdna/DNA_action_types.h
branches/particles-2010/source/blender/makesdna/DNA_anim_types.h
branches/particles-2010/source/blender/makesdna/DNA_armature_types.h
branches/particles-2010/source/blender/makesdna/DNA_boid_types.h
branches/particles-2010/source/blender/makesdna/DNA_constraint_types.h
branches/particles-2010/source/blender/makesdna/DNA_curve_types.h
branches/particles-2010/source/blender/makesdna/DNA_object_force.h
branches/particles-2010/source/blender/makesdna/DNA_sensor_types.h
branches/particles-2010/source/blender/makesdna/DNA_sequence_types.h
branches/particles-2010/source/blender/makesdna/DNA_smoke_types.h
branches/particles-2010/source/blender/makesdna/DNA_userdef_types.h
branches/particles-2010/source/blender/makesdna/DNA_view3d_types.h
branches/particles-2010/source/blender/makesdna/DNA_windowmanager_types.h
branches/particles-2010/source/blender/makesdna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesdna/intern/makesdna.c
branches/particles-2010/source/blender/makesrna/RNA_access.h
branches/particles-2010/source/blender/makesrna/RNA_types.h
branches/particles-2010/source/blender/makesrna/SConscript
branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesrna/intern/Makefile
branches/particles-2010/source/blender/makesrna/intern/SConscript
branches/particles-2010/source/blender/makesrna/intern/rna_access.c
branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
branches/particles-2010/source/blender/makesrna/intern/rna_armature_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_constraint.c
branches/particles-2010/source/blender/makesrna/intern/rna_main_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/makesrna/intern/rna_object.c
branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
branches/particles-2010/source/blender/makesrna/intern/rna_pose.c
branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/particles-2010/source/blender/makesrna/intern/rna_sensor.c
branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
branches/particles-2010/source/blender/makesrna/intern/rna_userdef.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
branches/particles-2010/source/blender/makesrna/intern/rna_world.c
branches/particles-2010/source/blender/modifiers/CMakeLists.txt
branches/particles-2010/source/blender/modifiers/intern/MOD_array.c
branches/particles-2010/source/blender/modifiers/intern/MOD_mask.c
branches/particles-2010/source/blender/modifiers/intern/MOD_meshdeform.c
branches/particles-2010/source/blender/modifiers/intern/MOD_mirror.c
branches/particles-2010/source/blender/modifiers/intern/MOD_nodetree.c
branches/particles-2010/source/blender/modifiers/intern/MOD_screw.c
branches/particles-2010/source/blender/nodes/CMakeLists.txt
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodetree.c
branches/particles-2010/source/blender/nodes/intern/CMP_util.c
branches/particles-2010/source/blender/nodes/intern/CMP_util.h
branches/particles-2010/source/blender/python/BPY_extern.h
branches/particles-2010/source/blender/python/generic/CMakeLists.txt
branches/particles-2010/source/blender/python/generic/bgl.c
branches/particles-2010/source/blender/python/generic/mathutils_color.c
branches/particles-2010/source/blender/python/generic/mathutils_euler.c
branches/particles-2010/source/blender/python/generic/mathutils_geometry.c
branches/particles-2010/source/blender/python/generic/mathutils_matrix.c
branches/particles-2010/source/blender/python/generic/mathutils_quat.c
branches/particles-2010/source/blender/python/generic/mathutils_vector.c
branches/particles-2010/source/blender/python/intern/CMakeLists.txt
branches/particles-2010/source/blender/python/intern/bpy.c
branches/particles-2010/source/blender/python/intern/bpy_app.c
branches/particles-2010/source/blender/python/intern/bpy_app.h
branches/particles-2010/source/blender/python/intern/bpy_driver.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/python/intern/bpy_util.c
branches/particles-2010/source/blender/quicktime/CMakeLists.txt
branches/particles-2010/source/blender/readblenfile/CMakeLists.txt
branches/particles-2010/source/blender/render/CMakeLists.txt
branches/particles-2010/source/blender/render/intern/source/convertblender.c
branches/particles-2010/source/blender/render/intern/source/rayshade.c
branches/particles-2010/source/blender/render/intern/source/shadeinput.c
branches/particles-2010/source/blender/render/intern/source/shadeoutput.c
branches/particles-2010/source/blender/render/intern/source/texture.c
branches/particles-2010/source/blender/render/intern/source/volumetric.c
branches/particles-2010/source/blender/render/intern/source/voxeldata.c
branches/particles-2010/source/blender/render/intern/source/zbuf.c
branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
branches/particles-2010/source/blender/windowmanager/WM_api.h
branches/particles-2010/source/blender/windowmanager/intern/wm_cursors.c
branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
branches/particles-2010/source/blender/windowmanager/intern/wm_jobs.c
branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
branches/particles-2010/source/blender/windowmanager/wm_cursors.h
branches/particles-2010/source/blenderplayer/CMakeLists.txt
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/creator.c
branches/particles-2010/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/particles-2010/source/gameengine/CMakeLists.txt
branches/particles-2010/source/gameengine/Converter/CMakeLists.txt
branches/particles-2010/source/gameengine/Expressions/CMakeLists.txt
branches/particles-2010/source/gameengine/GameLogic/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/common/Makefile
branches/particles-2010/source/gameengine/GamePlayer/common/SConscript
branches/particles-2010/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/particles-2010/source/gameengine/Network/CMakeLists.txt
branches/particles-2010/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/common/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/particles-2010/source/gameengine/SceneGraph/CMakeLists.txt
branches/particles-2010/source/gameengine/SceneGraph/SConscript
branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
branches/particles-2010/source/kernel/CMakeLists.txt
Added Paths:
-----------
branches/particles-2010/build_files/cmake/cmake_consistency_check.py
branches/particles-2010/extern/libredcode/CMakeLists.txt
Removed Paths:
-------------
branches/particles-2010/source/gameengine/GamePlayer/common/unix/
branches/particles-2010/source/gameengine/GamePlayer/common/windows/
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2010-12-03 03:44:39 UTC (rev 33437)
+++ branches/particles-2010/CMakeLists.txt 2010-12-03 09:48:31 UTC (rev 33438)
@@ -88,25 +88,26 @@
# Image format support
OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
-OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
OPTION(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
OPTION(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
OPTION(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
OPTION(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
+OPTION(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
-# Audio format support
-OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
+# Audio/Video format support
+OPTION(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+OPTION(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
IF(APPLE OR (WIN32 AND NOT UNIX))
- OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
+ OPTION(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
ENDIF(APPLE OR (WIN32 AND NOT UNIX))
# 3D format support
# disable opencollada on non-apple unix because opencollada has no package for debian
IF(UNIX AND NOT APPLE)
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
+ OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
ELSE()
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
+ OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
ENDIF()
# Sound output
@@ -135,17 +136,21 @@
# OPTION(WITH_LCMS "Enable color correction with lcms" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
- MESSAGE(FATAL_ERROR "WITH_PLAYER needs WITH_GAMEENGINE")
+ MESSAGE(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
- MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
+ MESSAGE("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
IF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
- MESSAGE(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK need WITH_SAMPLERATE")
+ MESSAGE(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
ENDIF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+IF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+ MESSAGE(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+ENDIF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+
TEST_SSE_SUPPORT()
# disabled for now, not supported
@@ -178,12 +183,12 @@
SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
- SET(SNDFILE /usr)
- SET(SNDFILE_INC ${SNDFILE}/include)
- SET(SNDFILE_LIB sndfile)
- SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
- ENDIF(WITH_SNDFILE)
+ IF(WITH_CODEC_SNDFILE)
+ SET(SNDFILE /usr)
+ SET(SNDFILE_INC ${SNDFILE}/include)
+ SET(SNDFILE_LIB sndfile)
+ SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+ ENDIF(WITH_CODEC_SNDFILE)
IF(WITH_INTERNATIONAL)
FIND_LIBRARY(INTL_LIBRARY
@@ -270,13 +275,13 @@
SET(LCMS_LIBPATH ${LCMS}/lib)
ENDIF(WITH_LCMS)
- IF(WITH_FFMPEG)
+ IF(WITH_CODEC_FFMPEG)
SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
- ENDIF(WITH_FFMPEG)
+ ENDIF(WITH_CODEC_FFMPEG)
IF(WITH_FFTW3)
SET(FFTW3 /usr)
@@ -411,12 +416,12 @@
SET(OPENAL_LIBPATH ${OPENAL}/lib)
ENDIF(WITH_OPENAL)
- IF(WITH_SNDFILE)
+ IF(WITH_CODEC_SNDFILE)
SET(SNDFILE ${LIBDIR}/sndfile)
SET(SNDFILE_INC ${SNDFILE}/include)
SET(SNDFILE_LIB libsndfile-1)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
- ENDIF(WITH_SNDFILE)
+ ENDIF(WITH_CODEC_SNDFILE)
IF(WITH_SDL)
SET(SDL ${LIBDIR}/sdl)
@@ -425,12 +430,12 @@
SET(SDL_LIBPATH ${SDL}/lib)
ENDIF(WITH_SDL)
- IF(WITH_QUICKTIME)
+ IF(WITH_CODEC_QUICKTIME)
SET(QUICKTIME ${LIBDIR}/QTDevWin)
SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
SET(QUICKTIME_LIB qtmlClient)
SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
- ENDIF(WITH_QUICKTIME)
+ ENDIF(WITH_CODEC_QUICKTIME)
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
@@ -522,12 +527,12 @@
SET(LCMS_LIB lcms)
ENDIF(WITH_LCMS)
- IF(WITH_FFMPEG)
+ IF(WITH_CODEC_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
- ENDIF(WITH_FFMPEG)
+ ENDIF(WITH_CODEC_FFMPEG)
IF(WITH_IMAGE_OPENEXR)
SET(OPENEXR ${LIBDIR}/openexr)
@@ -634,12 +639,12 @@
SET(PCRE_LIB pcre)
ENDIF(WITH_OPENCOLLADA)
- IF(WITH_FFMPEG)
+ IF(WITH_CODEC_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include)
SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
- ENDIF(WITH_FFMPEG)
+ ENDIF(WITH_CODEC_FFMPEG)
IF(WITH_IMAGE_OPENEXR)
SET(OPENEXR ${LIBDIR}/gcc/openexr)
@@ -712,12 +717,12 @@
SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
+ IF(WITH_CODEC_SNDFILE)
SET(SNDFILE ${LIBDIR}/sndfile)
SET(SNDFILE_INC ${SNDFILE}/include)
SET(SNDFILE_LIB sndfile FLAC ogg vorbis vorbisenc)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib)
- ENDIF(WITH_SNDFILE)
+ ENDIF(WITH_CODEC_SNDFILE)
SET(PYTHON_VERSION 3.1)
@@ -782,13 +787,13 @@
SET(LCMS_LIBPATH ${LCMS}/lib)
ENDIF(WITH_LCMS)
- IF(WITH_FFMPEG)
+ IF(WITH_CODEC_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
- ENDIF(WITH_FFMPEG)
+ ENDIF(WITH_CODEC_FFMPEG)
IF(WITH_SAMPLERATE)
SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
@@ -809,7 +814,7 @@
SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
#libSDL still needs 32bit carbon quicktime
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- ELSEIF(WITH_QUICKTIME)
+ ELSEIF(WITH_CODEC_QUICKTIME)
SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
ENDIF(USE_QTKIT)
ELSE (WITH_COCOA)
@@ -919,9 +924,13 @@
IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG})
- set(OPENJPEG_LIb extern_openjpeg)
ENDIF(WITH_IMAGE_OPENJPEG)
+IF(WITH_IMAGE_REDCODE)
+ set(REDCODE ${CMAKE_SOURCE_DIR}/extern)
+ set(REDCODE_INC ${REDCODE})
+ENDIF(WITH_IMAGE_REDCODE)
+
#-----------------------------------------------------------------------------
# Blender WebPlugin
Copied: branches/particles-2010/build_files/cmake/cmake_consistency_check.py (from rev 33437, trunk/blender/build_files/cmake/cmake_consistency_check.py)
===================================================================
--- branches/particles-2010/build_files/cmake/cmake_consistency_check.py (rev 0)
+++ branches/particles-2010/build_files/cmake/cmake_consistency_check.py 2010-12-03 09:48:31 UTC (rev 33438)
@@ -0,0 +1,191 @@
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton
+#
+# ***** END GPL LICENSE BLOCK *****
+
+IGNORE = \
+ "/test/",\
+ "/decimate_glut_test/",\
+ "/BSP_GhostTest/",\
+ "/release/",\
+ "/xembed/",\
+ "/decimation/intern/future/",\
+ "/TerraplayNetwork/",\
+ "/ik_glut_test/"
+
+import os
+from os.path import join, dirname, normpath
+
+base = join(os.getcwd(), "..", "..")
+base = normpath(base)
+
+global_h = set()
+global_c = set()
+
+import os
+from os.path import splitext
+def source_list(path, filename_check=None):
+ for dirpath, dirnames, filenames in os.walk(path):
+
+ # skip '.svn'
+ if dirpath.startswith("."):
+ continue
+
+ for filename in filenames:
+ if filename_check is None or filename_check(filename):
+ yield os.path.join(dirpath, filename)
+
+# extension checking
+def is_c_header(filename):
+ ext = splitext(filename)[1]
+ return (ext in (".h", ".hpp", ".hxx"))
+
+def is_cmake(filename):
+ ext = splitext(filename)[1]
+ return (ext == ".cmake") or (filename == "CMakeLists.txt")
+
+def is_c_header(filename):
+ ext = splitext(filename)[1]
+ return (ext in (".h", ".hpp", ".hxx"))
+
+def is_c(filename):
+ ext = splitext(filename)[1]
+ return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+
+def is_c_any(filename):
+ return is_c(filename) or is_c_header(filename)
+
+def cmake_get_src(f):
+
+ sources_h = []
+ sources_c = []
+
+ filen = open(f, "r")
+ it = iter(filen)
+ found = False
+ i = 0
+ # print(f)
+ while it is not None:
+ while it is not None:
+ i += 1
+ try:
+ l = next(it)
+ except StopIteration:
+ it = None
+ break
+ l = l.strip()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list