[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29398] branches/soc-2010-moguri: merge 29073 - 29396

Mitchell Stokes mogurijin at gmail.com
Fri Jun 11 03:34:19 CEST 2010


Revision: 29398
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29398
Author:   moguri
Date:     2010-06-11 03:34:13 +0200 (Fri, 11 Jun 2010)

Log Message:
-----------
merge 29073 - 29396

Modified Paths:
--------------
    branches/soc-2010-moguri/CMake/macros.cmake
    branches/soc-2010-moguri/CMakeLists.txt
    branches/soc-2010-moguri/SConstruct
    branches/soc-2010-moguri/config/aix4-config.py
    branches/soc-2010-moguri/config/linuxcross-config.py
    branches/soc-2010-moguri/config/win32-mingw-config.py
    branches/soc-2010-moguri/config/win32-vc-config.py
    branches/soc-2010-moguri/config/win64-vc-config.py
    branches/soc-2010-moguri/intern/ghost/GHOST_C-api.h
    branches/soc-2010-moguri/intern/ghost/GHOST_IWindow.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_Window.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2010-moguri/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2010-moguri/intern/string/STR_String.h
    branches/soc-2010-moguri/release/scripts/io/export_3ds.py
    branches/soc-2010-moguri/release/scripts/io/export_fbx.py
    branches/soc-2010-moguri/release/scripts/io/export_mdd.py
    branches/soc-2010-moguri/release/scripts/io/export_obj.py
    branches/soc-2010-moguri/release/scripts/io/export_ply.py
    branches/soc-2010-moguri/release/scripts/io/export_x3d.py
    branches/soc-2010-moguri/release/scripts/io/netrender/client.py
    branches/soc-2010-moguri/release/scripts/io/netrender/operators.py
    branches/soc-2010-moguri/release/scripts/io/netrender/repath.py
    branches/soc-2010-moguri/release/scripts/io/netrender/ui.py
    branches/soc-2010-moguri/release/scripts/modules/bpy/__init__.py
    branches/soc-2010-moguri/release/scripts/modules/bpy/utils.py
    branches/soc-2010-moguri/release/scripts/modules/bpy_types.py
    branches/soc-2010-moguri/release/scripts/modules/graphviz_export.py
    branches/soc-2010-moguri/release/scripts/modules/rigify/__init__.py
    branches/soc-2010-moguri/release/scripts/op/add_mesh_torus.py
    branches/soc-2010-moguri/release/scripts/op/console_python.py
    branches/soc-2010-moguri/release/scripts/op/image.py
    branches/soc-2010-moguri/release/scripts/op/object.py
    branches/soc-2010-moguri/release/scripts/op/sequencer.py
    branches/soc-2010-moguri/release/scripts/op/uv.py
    branches/soc-2010-moguri/release/scripts/op/wm.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_armature_rigify.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_lamp.py
    branches/soc-2010-moguri/release/scripts/ui/properties_data_modifier.py
    branches/soc-2010-moguri/release/scripts/ui/properties_game.py
    branches/soc-2010-moguri/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-moguri/release/scripts/ui/properties_particle.py
    branches/soc-2010-moguri/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2010-moguri/release/scripts/ui/properties_render.py
    branches/soc-2010-moguri/release/scripts/ui/properties_texture.py
    branches/soc-2010-moguri/release/scripts/ui/space_info.py
    branches/soc-2010-moguri/release/scripts/ui/space_logic.py
    branches/soc-2010-moguri/release/scripts/ui/space_node.py
    branches/soc-2010-moguri/release/scripts/ui/space_sequencer.py
    branches/soc-2010-moguri/release/scripts/ui/space_text.py
    branches/soc-2010-moguri/release/scripts/ui/space_userpref.py
    branches/soc-2010-moguri/release/scripts/ui/space_view3d.py
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_multires.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_particle.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_report.h
    branches/soc-2010-moguri/source/blender/blenkernel/BKE_subsurf.h
    branches/soc-2010-moguri/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/customdata.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/image.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/library.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/object.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/report.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/sound.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/text.c
    branches/soc-2010-moguri/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-moguri/source/blender/blenlib/BLI_fileops.h
    branches/soc-2010-moguri/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-moguri/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2010-moguri/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/fileops.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-moguri/source/blender/blenlib/intern/pbvh.c
    branches/soc-2010-moguri/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-moguri/source/blender/collada/DocumentExporter.cpp
    branches/soc-2010-moguri/source/blender/collada/DocumentExporter.h
    branches/soc-2010-moguri/source/blender/collada/DocumentImporter.cpp
    branches/soc-2010-moguri/source/blender/collada/DocumentImporter.h
    branches/soc-2010-moguri/source/blender/collada/SConscript
    branches/soc-2010-moguri/source/blender/collada/collada.cpp
    branches/soc-2010-moguri/source/blender/collada/collada.h
    branches/soc-2010-moguri/source/blender/collada/collada_internal.h
    branches/soc-2010-moguri/source/blender/editors/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/animation/keyframing.c
    branches/soc-2010-moguri/source/blender/editors/curve/editcurve.c
    branches/soc-2010-moguri/source/blender/editors/curve/editfont.c
    branches/soc-2010-moguri/source/blender/editors/datafiles/B.blend.c
    branches/soc-2010-moguri/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2010-moguri/source/blender/editors/include/ED_object.h
    branches/soc-2010-moguri/source/blender/editors/include/ED_view3d.h
    branches/soc-2010-moguri/source/blender/editors/include/UI_interface.h
    branches/soc-2010-moguri/source/blender/editors/interface/interface.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_panel.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-moguri/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-moguri/source/blender/editors/interface/view2d_ops.c
    branches/soc-2010-moguri/source/blender/editors/mesh/editmesh.c
    branches/soc-2010-moguri/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-moguri/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-moguri/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-moguri/source/blender/editors/object/object_add.c
    branches/soc-2010-moguri/source/blender/editors/object/object_constraint.c
    branches/soc-2010-moguri/source/blender/editors/object/object_edit.c
    branches/soc-2010-moguri/source/blender/editors/object/object_intern.h
    branches/soc-2010-moguri/source/blender/editors/object/object_modifier.c
    branches/soc-2010-moguri/source/blender/editors/object/object_ops.c
    branches/soc-2010-moguri/source/blender/editors/object/object_relations.c
    branches/soc-2010-moguri/source/blender/editors/object/object_vgroup.c
    branches/soc-2010-moguri/source/blender/editors/physics/particle_edit.c
    branches/soc-2010-moguri/source/blender/editors/physics/physics_fluid.c
    branches/soc-2010-moguri/source/blender/editors/render/render_shading.c
    branches/soc-2010-moguri/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/screen/SConscript
    branches/soc-2010-moguri/source/blender/editors/screen/area.c
    branches/soc-2010-moguri/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-moguri/source/blender/editors/screen/screendump.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2010-moguri/source/blender/editors/sound/SConscript
    branches/soc-2010-moguri/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_api/SConscript
    branches/soc-2010-moguri/source/blender/editors/space_buttons/SConscript
    branches/soc-2010-moguri/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_console/space_console.c
    branches/soc-2010-moguri/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-moguri/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_info/SConscript
    branches/soc-2010-moguri/source/blender/editors/space_info/info_intern.h
    branches/soc-2010-moguri/source/blender/editors/space_info/info_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_info/space_info.c
    branches/soc-2010-moguri/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-moguri/source/blender/editors/space_node/drawnode.c
    branches/soc-2010-moguri/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_node/node_intern.h
    branches/soc-2010-moguri/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_node/node_state.c
    branches/soc-2010-moguri/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-moguri/source/blender/editors/space_script/script_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_script/script_intern.h
    branches/soc-2010-moguri/source/blender/editors/space_script/script_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_script/space_script.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-moguri/source/blender/editors/space_text/text_ops.c
    branches/soc-2010-moguri/source/blender/editors/space_userpref/SConscript
    branches/soc-2010-moguri/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2010-moguri/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-moguri/source/blender/editors/transform/transform_ops.c
    branches/soc-2010-moguri/source/blender/imbuf/IMB_thumbs.h
    branches/soc-2010-moguri/source/blender/imbuf/intern/IMB_filetype.h
    branches/soc-2010-moguri/source/blender/imbuf/intern/filetype.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/thumbs.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-moguri/source/blender/imbuf/intern/tiff.c
    branches/soc-2010-moguri/source/blender/makesdna/DNA_ID.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2010-moguri/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2010-moguri/source/blender/makesrna/RNA_types.h
    branches/soc-2010-moguri/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_image.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_main.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_text.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_vfont.c
    branches/soc-2010-moguri/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2010-moguri/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2010-moguri/source/blender/python/BPY_extern.h
    branches/soc-2010-moguri/source/blender/python/doc/blender-org/layout.html
    branches/soc-2010-moguri/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2010-moguri/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-moguri/source/blender/python/doc/sphinx_html_compact.diff
    branches/soc-2010-moguri/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-moguri/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2010-moguri/source/blender/python/intern/bpy.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_driver.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_interface.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_props.c
    branches/soc-2010-moguri/source/blender/python/intern/bpy_props.h
    branches/soc-2010-moguri/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-moguri/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-moguri/source/blender/render/intern/source/voxeldata.c
    branches/soc-2010-moguri/source/blender/windowmanager/WM_api.h
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-moguri/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-moguri/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2010-moguri/source/creator/CMakeLists.txt
    branches/soc-2010-moguri/source/creator/creator.c
    branches/soc-2010-moguri/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2010-moguri/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2010-moguri/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2010-moguri/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
    branches/soc-2010-moguri/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
    branches/soc-2010-moguri/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2010-moguri/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
    branches/soc-2010-moguri/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2010-moguri/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2010-moguri/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/soc-2010-moguri/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2010-moguri/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2010-moguri/source/gameengine/Converter/BlenderWorldInfo.h
    branches/soc-2010-moguri/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/soc-2010-moguri/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2010-moguri/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2010-moguri/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/soc-2010-moguri/source/gameengine/Expressions/BoolValue.h
    branches/soc-2010-moguri/source/gameengine/Expressions/ConstExpr.h
    branches/soc-2010-moguri/source/gameengine/Expressions/EmptyValue.h
    branches/soc-2010-moguri/source/gameengine/Expressions/ErrorValue.h
    branches/soc-2010-moguri/source/gameengine/Expressions/Expression.h
    branches/soc-2010-moguri/source/gameengine/Expressions/FloatValue.h
    branches/soc-2010-moguri/source/gameengine/Expressions/IdentifierExpr.h
    branches/soc-2010-moguri/source/gameengine/Expressions/IfExpr.h
    branches/soc-2010-moguri/source/gameengine/Expressions/InputParser.h
    branches/soc-2010-moguri/source/gameengine/Expressions/IntValue.h
    branches/soc-2010-moguri/source/gameengine/Expressions/KX_HashedPtr.h
    branches/soc-2010-moguri/source/gameengine/Expressions/Operator1Expr.h
    branches/soc-2010-moguri/source/gameengine/Expressions/Operator2Expr.h
    branches/soc-2010-moguri/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2010-moguri/source/gameengine/Expressions/StringValue.h
    branches/soc-2010-moguri/source/gameengine/Expressions/Value.h
    branches/soc-2010-moguri/source/gameengine/Expressions/VectorValue.h
    branches/soc-2010-moguri/source/gameengine/Expressions/VoidValue.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_BasicEventManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_EventManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_IScene.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/soc-2010-moguri/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/BL_Texture.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_CameraIpoSGController.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_Dome.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_EmptyObject.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_IInterpolator.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_IScalarInterpolator.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_ISystem.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_MaterialIpoController.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_MotionState.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_OrientationInterpolator.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_PositionInterpolator.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_RayCast.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_ScalarInterpolator.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_ScalingInterpolator.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_WorldInfo.h
    branches/soc-2010-moguri/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/soc-2010-moguri/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
    branches/soc-2010-moguri/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2010-moguri/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2010-moguri/source/gameengine/Network/NG_NetworkMessage.h
    branches/soc-2010-moguri/source/gameengine/Network/NG_NetworkObject.h
    branches/soc-2010-moguri/source/gameengine/Network/NG_NetworkScene.h
    branches/soc-2010-moguri/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h
    branches/soc-2010-moguri/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/soc-2010-moguri/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2010-moguri/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2010-moguri/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/soc-2010-moguri/source/gameengine/Physics/common/PHY_IController.h
    branches/soc-2010-moguri/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2010-moguri/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2010-moguri/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2010-moguri/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2010-moguri/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/soc-2010-moguri/source/gameengine/PyDoc/bge.events.rst
    branches/soc-2010-moguri/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2010-moguri/source/gameengine/PyDoc/bge.render.rst
    branches/soc-2010-moguri/source/gameengine/PyDoc/bge.types.rst
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_Rect.h
    branches/soc-2010-moguri/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_BBox.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_Controller.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_Node.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_QList.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_Spatial.h
    branches/soc-2010-moguri/source/gameengine/SceneGraph/SG_Tree.h
    branches/soc-2010-moguri/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2010-moguri/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2010-moguri/tools/Blender.py

Added Paths:
-----------
    branches/soc-2010-moguri/doc/blender.1
    branches/soc-2010-moguri/source/blender/editors/animation/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/curve/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/gpencil/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/interface/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/metaball/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/object/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/render/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/sound/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_action/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_api/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_outliner/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_sound/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_time/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_userpref/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/space_view3d/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/util/CMakeLists.txt
    branches/soc-2010-moguri/source/blender/editors/uvedit/CMakeLists.txt

Modified: branches/soc-2010-moguri/CMake/macros.cmake
===================================================================
--- branches/soc-2010-moguri/CMake/macros.cmake	2010-06-11 00:23:53 UTC (rev 29397)
+++ branches/soc-2010-moguri/CMake/macros.cmake	2010-06-11 01:34:13 UTC (rev 29398)
@@ -1,178 +1,183 @@
 MACRO(BLENDERLIB_NOLIST
-  name
-  sources
-  includes)
+	name
+	sources
+	includes)
 
-  # Gather all headers
-  FILE(GLOB_RECURSE INC_ALL *.h)
-     
-  INCLUDE_DIRECTORIES(${includes})
-  ADD_LIBRARY(${name} ${INC_ALL} ${sources})
+	# Gather all headers
+	FILE(GLOB_RECURSE INC_ALL *.h)
+		 
+	INCLUDE_DIRECTORIES(${includes})
+	ADD_LIBRARY(${name} ${INC_ALL} ${sources})
 
-  # Group by location on disk
-  SOURCE_GROUP(Files FILES CMakeLists.txt)
-  SET(ALL_FILES ${sources} ${INC_ALL})
-  FOREACH(SRC ${ALL_FILES})
-    STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
-    STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
-    STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
-    IF(REL_DIR)
-      SOURCE_GROUP(${REL_DIR} FILES ${SRC})
-    ELSE(REL_DIR)
-      SOURCE_GROUP(Files FILES ${SRC})
-    ENDIF(REL_DIR)
-  ENDFOREACH(SRC)
+	# Group by location on disk
+	SOURCE_GROUP(Files FILES CMakeLists.txt)
+	SET(ALL_FILES ${sources} ${INC_ALL})
+	FOREACH(SRC ${ALL_FILES})
+		STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
+		STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
+		STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
+		IF(REL_DIR)
+			SOURCE_GROUP(${REL_DIR} FILES ${SRC})
+		ELSE(REL_DIR)
+			SOURCE_GROUP(Files FILES ${SRC})
+		ENDIF(REL_DIR)
+	ENDFOREACH(SRC)
 
-  MESSAGE(STATUS "Configuring library ${name}")
+	MESSAGE(STATUS "Configuring library ${name}")
 ENDMACRO(BLENDERLIB_NOLIST)
 
 MACRO(BLENDERLIB
-  name
-  sources
-  includes)
+	name
+	sources
+	includes)
 
-  BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
+	BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
 
-  # Add to blender's list of libraries
-  FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
+	# Add to blender's list of libraries
+	FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
 ENDMACRO(BLENDERLIB)
 
 MACRO(SETUP_LIBDIRS)
-  # see "cmake --help-policy CMP0003"
-  if(COMMAND cmake_policy)
-    CMAKE_POLICY(SET CMP0003 NEW)
-  endif(COMMAND cmake_policy)
-  
-  LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
-  
-  IF(WITH_PYTHON)
-    LINK_DIRECTORIES(${PYTHON_LIBPATH})
-  ENDIF(WITH_PYTHON)
-  IF(WITH_INTERNATIONAL)
-    LINK_DIRECTORIES(${ICONV_LIBPATH})
-    LINK_DIRECTORIES(${GETTEXT_LIBPATH})
-  ENDIF(WITH_INTERNATIONAL)
-  IF(WITH_SDL)
-    LINK_DIRECTORIES(${SDL_LIBPATH})
-  ENDIF(WITH_SDL)
-  IF(WITH_FFMPEG)
-    LINK_DIRECTORIES(${FFMPEG_LIBPATH})
-  ENDIF(WITH_FFMPEG)
-  IF(WITH_OPENEXR)
-    LINK_DIRECTORIES(${OPENEXR_LIBPATH})
-  ENDIF(WITH_OPENEXR)
-  IF(WITH_TIFF)
-    LINK_DIRECTORIES(${TIFF_LIBPATH})
-  ENDIF(WITH_TIFF)
-  IF(WITH_QUICKTIME)
-    LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
-  ENDIF(WITH_QUICKTIME)
-  IF(WITH_OPENAL)
-    LINK_DIRECTORIES(${OPENAL_LIBPATH})
-  ENDIF(WITH_OPENAL)
-  IF(WITH_JACK)
-    LINK_DIRECTORIES(${JACK_LIBPATH})
-  ENDIF(WITH_JACK)
-  IF(WITH_SNDFILE)
-    LINK_DIRECTORIES(${SNDFILE_LIBPATH})
-  ENDIF(WITH_SNDFILE)
-  IF(WITH_FFTW3)
-    LINK_DIRECTORIES(${FFTW3_LIBPATH})
-  ENDIF(WITH_FFTW3)
-  IF(WITH_OPENCOLLADA)
-    LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
-    LINK_DIRECTORIES(${PCRE_LIBPATH})
-    LINK_DIRECTORIES(${EXPAT_LIBPATH})
-  ENDIF(WITH_OPENCOLLADA)
+	# see "cmake --help-policy CMP0003"
+	if(COMMAND cmake_policy)
+		CMAKE_POLICY(SET CMP0003 NEW)
+	endif(COMMAND cmake_policy)
+	
+	LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+	
+	IF(WITH_PYTHON)
+		LINK_DIRECTORIES(${PYTHON_LIBPATH})
+	ENDIF(WITH_PYTHON)
+	IF(WITH_INTERNATIONAL)
+		LINK_DIRECTORIES(${ICONV_LIBPATH})
+		LINK_DIRECTORIES(${GETTEXT_LIBPATH})
+	ENDIF(WITH_INTERNATIONAL)
+	IF(WITH_SDL)
+		LINK_DIRECTORIES(${SDL_LIBPATH})
+	ENDIF(WITH_SDL)
+	IF(WITH_FFMPEG)
+		LINK_DIRECTORIES(${FFMPEG_LIBPATH})
+	ENDIF(WITH_FFMPEG)
+	IF(WITH_OPENEXR)
+		LINK_DIRECTORIES(${OPENEXR_LIBPATH})
+	ENDIF(WITH_OPENEXR)
+	IF(WITH_TIFF)
+		LINK_DIRECTORIES(${TIFF_LIBPATH})
+	ENDIF(WITH_TIFF)
+	IF(WITH_LCMS)
+		LINK_DIRECTORIES(${LCMS_LIBPATH})
+	ENDIF(WITH_LCMS)
+	IF(WITH_QUICKTIME)
+		LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
+	ENDIF(WITH_QUICKTIME)
+	IF(WITH_OPENAL)
+		LINK_DIRECTORIES(${OPENAL_LIBPATH})
+	ENDIF(WITH_OPENAL)
+	IF(WITH_JACK)
+		LINK_DIRECTORIES(${JACK_LIBPATH})
+	ENDIF(WITH_JACK)
+	IF(WITH_SNDFILE)
+		LINK_DIRECTORIES(${SNDFILE_LIBPATH})
+	ENDIF(WITH_SNDFILE)
+	IF(WITH_FFTW3)
+		LINK_DIRECTORIES(${FFTW3_LIBPATH})
+	ENDIF(WITH_FFTW3)
+	IF(WITH_OPENCOLLADA)
+		LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+		LINK_DIRECTORIES(${PCRE_LIBPATH})
+		LINK_DIRECTORIES(${EXPAT_LIBPATH})
+	ENDIF(WITH_OPENCOLLADA)
 
-  IF(WIN32)
-    LINK_DIRECTORIES(${PTHREADS_LIBPATH})
-  ENDIF(WIN32)
+	IF(WIN32)
+		LINK_DIRECTORIES(${PTHREADS_LIBPATH})
+	ENDIF(WIN32)
 ENDMACRO(SETUP_LIBDIRS)
 
 MACRO(SETUP_LIBLINKS
-  target)
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
+	target)
+	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
 
-  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
+	TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
 
-  # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
-  IF(WITH_PYTHON)
-    TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
-  
-    IF(WIN32)
-      TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
-      TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
-    ELSE(WIN32)
-      TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
-    ENDIF(WIN32)
-  ENDIF(WITH_PYTHON)
-  
-  TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
-  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
+	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
+	IF(WITH_PYTHON)
+		TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
 
-  IF(WITH_INTERNATIONAL)
-    TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
-	
-    IF(WIN32)
-      TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
-    ENDIF(WIN32)
-  ENDIF(WITH_INTERNATIONAL)
-  
-  IF(WITH_OPENAL)
-    TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
-  ENDIF(WITH_OPENAL)
-  IF(WITH_FFTW3)  
-    TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
-  ENDIF(WITH_FFTW3)
-  IF(WITH_JACK)
-    TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
-  ENDIF(WITH_JACK)
-  IF(WITH_SNDFILE)
-    TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
-  ENDIF(WITH_SNDFILE)
-  IF(WITH_SDL)
-    TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
-  ENDIF(WITH_SDL)
-  IF(WITH_QUICKTIME)
-    TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
-  ENDIF(WITH_QUICKTIME)
-  IF(WITH_TIFF)
-    TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
-  ENDIF(WITH_TIFF)
-  IF(WITH_OPENEXR)
-    IF(WIN32)
-      FOREACH(loop_var ${OPENEXR_LIB})
-        TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
-        TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
-      ENDFOREACH(loop_var)
-    ELSE(WIN32)
-      TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
-    ENDIF(WIN32)
-  ENDIF(WITH_OPENEXR)
-  IF(WITH_FFMPEG)
-    TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
-  ENDIF(WITH_FFMPEG)
-  IF(WITH_OPENCOLLADA)
-    IF(WIN32)
-      FOREACH(loop_var ${OPENCOLLADA_LIB})
-        TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
-        TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
-      ENDFOREACH(loop_var)
-      TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
-      TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
-      IF(EXPAT_LIB)
-        TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d)
-        TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
-      ENDIF(EXPAT_LIB)
-    ELSE(WIN32)
-	  TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
-      TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
-      TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
-    ENDIF(WIN32)
-  ENDIF(WITH_OPENCOLLADA)
-  IF(WIN32)
-    TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
-  ENDIF(WIN32)
+		IF(WIN32)
+			TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+			TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+		ELSE(WIN32)
+			TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+		ENDIF(WIN32)
+	ENDIF(WITH_PYTHON)
+
+	TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
+	TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
+
+	IF(WITH_INTERNATIONAL)
+		TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
+
+		IF(WIN32)
+			TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
+		ENDIF(WIN32)
+	ENDIF(WITH_INTERNATIONAL)
+
+	IF(WITH_OPENAL)
+		TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
+	ENDIF(WITH_OPENAL)
+	IF(WITH_FFTW3)	
+		TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
+	ENDIF(WITH_FFTW3)
+	IF(WITH_JACK)
+		TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
+	ENDIF(WITH_JACK)
+	IF(WITH_SNDFILE)
+		TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
+	ENDIF(WITH_SNDFILE)
+	IF(WITH_SDL)
+		TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
+	ENDIF(WITH_SDL)
+	IF(WITH_QUICKTIME)
+		TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
+	ENDIF(WITH_QUICKTIME)
+	IF(WITH_TIFF)
+		TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
+	ENDIF(WITH_TIFF)
+	IF(WITH_OPENEXR)
+		IF(WIN32)
+			FOREACH(loop_var ${OPENEXR_LIB})
+				TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+				TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+			ENDFOREACH(loop_var)
+		ELSE(WIN32)
+			TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+		ENDIF(WIN32)
+	ENDIF(WITH_OPENEXR)
+	IF(WITH_LCMS)
+		TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY})
+	ENDIF(WITH_LCMS)
+	IF(WITH_FFMPEG)
+		TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
+	ENDIF(WITH_FFMPEG)
+	IF(WITH_OPENCOLLADA)
+		IF(WIN32)
+			FOREACH(loop_var ${OPENCOLLADA_LIB})
+				TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list