[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23478] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22999 :23200

Campbell Barton ideasman42 at gmail.com
Fri Sep 25 09:20:33 CEST 2009 

Revision: 23478
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23478
Author:   campbellbarton
Date:     2009-09-25 09:20:32 +0200 (Fri, 25 Sep 2009)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22999:23200

Modified Paths:
--------------
    branches/ge_dyn_load/CMakeLists.txt
    branches/ge_dyn_load/SConstruct
    branches/ge_dyn_load/extern/CMakeLists.txt
    branches/ge_dyn_load/extern/Makefile
    branches/ge_dyn_load/extern/binreloc/SConscript
    branches/ge_dyn_load/extern/bullet2/CMakeLists.txt
    branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CMakeLists.txt
    branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
    branches/ge_dyn_load/extern/bullet2/src/SConscript
    branches/ge_dyn_load/extern/glew/CMakeLists.txt
    branches/ge_dyn_load/extern/glew/SConscript
    branches/ge_dyn_load/extern/libopenjpeg/SConscript
    branches/ge_dyn_load/intern/CMakeLists.txt
    branches/ge_dyn_load/intern/audaspace/CMakeLists.txt
    branches/ge_dyn_load/intern/audaspace/FX/AUD_DoubleReader.cpp
    branches/ge_dyn_load/intern/audaspace/FX/AUD_PingPongFactory.cpp
    branches/ge_dyn_load/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/ge_dyn_load/intern/audaspace/SConscript
    branches/ge_dyn_load/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
    branches/ge_dyn_load/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/ge_dyn_load/intern/audaspace/intern/AUD_C-API.cpp
    branches/ge_dyn_load/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/ge_dyn_load/intern/elbeem/CMakeLists.txt
    branches/ge_dyn_load/intern/ghost/CMakeLists.txt
    branches/ge_dyn_load/intern/ghost/SConscript
    branches/ge_dyn_load/intern/guardedalloc/CMakeLists.txt
    branches/ge_dyn_load/intern/guardedalloc/SConscript
    branches/ge_dyn_load/intern/iksolver/SConscript
    branches/ge_dyn_load/intern/iksolver/intern/TNT/tntmath.h
    branches/ge_dyn_load/intern/memutil/SConscript
    branches/ge_dyn_load/intern/moto/SConscript
    branches/ge_dyn_load/intern/smoke/CMakeLists.txt
    branches/ge_dyn_load/intern/smoke/extern/smoke_API.h
    branches/ge_dyn_load/intern/smoke/intern/FLUID_3D.cpp
    branches/ge_dyn_load/intern/smoke/intern/FLUID_3D.h
    branches/ge_dyn_load/intern/smoke/intern/FLUID_3D_STATIC.cpp
    branches/ge_dyn_load/intern/smoke/intern/WTURBULENCE.cpp
    branches/ge_dyn_load/intern/smoke/intern/WTURBULENCE.h
    branches/ge_dyn_load/intern/smoke/intern/smoke_API.cpp
    branches/ge_dyn_load/intern/smoke/intern/tnt/tnt_math_utils.h
    branches/ge_dyn_load/intern/string/SConscript
    branches/ge_dyn_load/intern/string/STR_String.h
    branches/ge_dyn_load/projectfiles_vc9/blender/blender.vcproj
    branches/ge_dyn_load/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/ge_dyn_load/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/ge_dyn_load/projectfiles_vc9/blender/loader/BLO_loader.vcproj
    branches/ge_dyn_load/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/ge_dyn_load/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/ge_dyn_load/release/datafiles/blenderbuttons
    branches/ge_dyn_load/release/io/engine_render_pov.py
    branches/ge_dyn_load/release/io/export_ply.py
    branches/ge_dyn_load/release/ui/buttons_data_armature.py
    branches/ge_dyn_load/release/ui/buttons_data_bone.py
    branches/ge_dyn_load/release/ui/buttons_data_curve.py
    branches/ge_dyn_load/release/ui/buttons_data_empty.py
    branches/ge_dyn_load/release/ui/buttons_data_modifier.py
    branches/ge_dyn_load/release/ui/buttons_data_text.py
    branches/ge_dyn_load/release/ui/buttons_object_constraint.py
    branches/ge_dyn_load/release/ui/buttons_particle.py
    branches/ge_dyn_load/release/ui/buttons_physics_smoke.py
    branches/ge_dyn_load/release/ui/space_console.py
    branches/ge_dyn_load/release/ui/space_image.py
    branches/ge_dyn_load/release/ui/space_info.py
    branches/ge_dyn_load/release/ui/space_sequencer.py
    branches/ge_dyn_load/release/ui/space_userpref.py
    branches/ge_dyn_load/release/ui/space_view3d.py
    branches/ge_dyn_load/release/ui/space_view3d_toolbar.py
    branches/ge_dyn_load/scons/scons-LICENSE
    branches/ge_dyn_load/scons/scons-README
    branches/ge_dyn_load/scons/scons-time.py
    branches/ge_dyn_load/scons/scons.py
    branches/ge_dyn_load/scons/sconsign.py
    branches/ge_dyn_load/source/CMakeLists.txt
    branches/ge_dyn_load/source/Makefile
    branches/ge_dyn_load/source/blender/CMakeLists.txt
    branches/ge_dyn_load/source/blender/avi/CMakeLists.txt
    branches/ge_dyn_load/source/blender/avi/SConscript
    branches/ge_dyn_load/source/blender/blenfont/CMakeLists.txt
    branches/ge_dyn_load/source/blender/blenfont/SConscript
    branches/ge_dyn_load/source/blender/blenkernel/BKE_anim.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_animsys.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_armature.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_blender.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_cloth.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_curve.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_depsgraph.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_global.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_group.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_key.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_library.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_node.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_particle.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_pointcache.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_sca.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_scene.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_smoke.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_text.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_utildefines.h
    branches/ge_dyn_load/source/blender/blenkernel/CMakeLists.txt
    branches/ge_dyn_load/source/blender/blenkernel/SConscript
    branches/ge_dyn_load/source/blender/blenkernel/intern/anim.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/anim_sys.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/armature.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/boids.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/booleanops.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/cloth.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/colortools.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/constraint.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/curve.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/depsgraph.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/displist.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/font.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/group.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/image.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/implicit.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/key.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/lattice.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/library.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/material.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/mesh.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/modifier.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/multires.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/node.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/object.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/packedFile.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/particle.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/particle_system.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/pointcache.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/sca.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/scene.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/smoke.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/softbody.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/sound.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/text.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/texture.c
    branches/ge_dyn_load/source/blender/blenlib/BLI_arithb.h
    branches/ge_dyn_load/source/blender/blenlib/BLI_fileops.h
    branches/ge_dyn_load/source/blender/blenlib/BLI_winstuff.h
    branches/ge_dyn_load/source/blender/blenlib/CMakeLists.txt
    branches/ge_dyn_load/source/blender/blenlib/SConscript
    branches/ge_dyn_load/source/blender/blenlib/intern/BLI_mempool.c
    branches/ge_dyn_load/source/blender/blenlib/intern/arithb.c
    branches/ge_dyn_load/source/blender/blenlib/intern/bpath.c
    branches/ge_dyn_load/source/blender/blenlib/intern/fileops.c
    branches/ge_dyn_load/source/blender/blenlib/intern/freetypefont.c
    branches/ge_dyn_load/source/blender/blenlib/intern/storage.c
    branches/ge_dyn_load/source/blender/blenlib/intern/util.c
    branches/ge_dyn_load/source/blender/blenloader/BLO_readfile.h
    branches/ge_dyn_load/source/blender/blenloader/CMakeLists.txt
    branches/ge_dyn_load/source/blender/blenloader/SConscript
    branches/ge_dyn_load/source/blender/blenloader/intern/readblenentry.c
    branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
    branches/ge_dyn_load/source/blender/blenloader/intern/writefile.c
    branches/ge_dyn_load/source/blender/blenpluginapi/CMakeLists.txt
    branches/ge_dyn_load/source/blender/editors/CMakeLists.txt
    branches/ge_dyn_load/source/blender/editors/animation/keyframing.c
    branches/ge_dyn_load/source/blender/editors/animation/keyingsets.c
    branches/ge_dyn_load/source/blender/editors/armature/editarmature.c
    branches/ge_dyn_load/source/blender/editors/armature/editarmature_generate.c
    branches/ge_dyn_load/source/blender/editors/armature/editarmature_retarget.c
    branches/ge_dyn_load/source/blender/editors/armature/meshlaplacian.c
    branches/ge_dyn_load/source/blender/editors/armature/poselib.c
    branches/ge_dyn_load/source/blender/editors/armature/poseobject.c
    branches/ge_dyn_load/source/blender/editors/curve/curve_ops.c
    branches/ge_dyn_load/source/blender/editors/curve/editcurve.c
    branches/ge_dyn_load/source/blender/editors/curve/editfont.c
    branches/ge_dyn_load/source/blender/editors/datafiles/blenderbuttons.c
    branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_dyn_load/source/blender/editors/include/ED_anim_api.h
    branches/ge_dyn_load/source/blender/editors/include/ED_armature.h
    branches/ge_dyn_load/source/blender/editors/include/ED_mball.h
    branches/ge_dyn_load/source/blender/editors/include/ED_mesh.h
    branches/ge_dyn_load/source/blender/editors/include/ED_object.h
    branches/ge_dyn_load/source/blender/editors/include/ED_screen_types.h
    branches/ge_dyn_load/source/blender/editors/include/UI_icons.h
    branches/ge_dyn_load/source/blender/editors/include/UI_interface.h
    branches/ge_dyn_load/source/blender/editors/interface/interface_icons.c
    branches/ge_dyn_load/source/blender/editors/interface/interface_layout.c
    branches/ge_dyn_load/source/blender/editors/interface/interface_templates.c
    branches/ge_dyn_load/source/blender/editors/interface/interface_utils.c
    branches/ge_dyn_load/source/blender/editors/interface/interface_widgets.c
    branches/ge_dyn_load/source/blender/editors/interface/resources.c
    branches/ge_dyn_load/source/blender/editors/interface/view2d_ops.c
    branches/ge_dyn_load/source/blender/editors/mesh/editmesh.c
    branches/ge_dyn_load/source/blender/editors/mesh/editmesh_add.c
    branches/ge_dyn_load/source/blender/editors/mesh/editmesh_loop.c
    branches/ge_dyn_load/source/blender/editors/mesh/editmesh_mods.c
    branches/ge_dyn_load/source/blender/editors/mesh/editmesh_tools.c
    branches/ge_dyn_load/source/blender/editors/mesh/mesh_intern.h
    branches/ge_dyn_load/source/blender/editors/mesh/mesh_layers.c
    branches/ge_dyn_load/source/blender/editors/mesh/mesh_ops.c
    branches/ge_dyn_load/source/blender/editors/mesh/meshtools.c
    branches/ge_dyn_load/source/blender/editors/object/object_edit.c
    branches/ge_dyn_load/source/blender/editors/object/object_intern.h
    branches/ge_dyn_load/source/blender/editors/object/object_modifier.c
    branches/ge_dyn_load/source/blender/editors/object/object_ops.c
    branches/ge_dyn_load/source/blender/editors/object/object_vgroup.c
    branches/ge_dyn_load/source/blender/editors/physics/ed_fluidsim.c
    branches/ge_dyn_load/source/blender/editors/physics/ed_pointcache.c
    branches/ge_dyn_load/source/blender/editors/physics/editparticle.c
    branches/ge_dyn_load/source/blender/editors/preview/previewrender.c
    branches/ge_dyn_load/source/blender/editors/screen/CMakeLists.txt
    branches/ge_dyn_load/source/blender/editors/screen/area.c
    branches/ge_dyn_load/source/blender/editors/screen/screen_context.c
    branches/ge_dyn_load/source/blender/editors/screen/screen_ops.c
    branches/ge_dyn_load/source/blender/editors/screen/screendump.c
    branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_image.c
    branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_ops.c
    branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_utils.c
    branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_dyn_load/source/blender/editors/sound/sound_ops.c
    branches/ge_dyn_load/source/blender/editors/space_action/space_action.c
    branches/ge_dyn_load/source/blender/editors/space_buttons/buttons_intern.h
    branches/ge_dyn_load/source/blender/editors/space_buttons/buttons_ops.c
    branches/ge_dyn_load/source/blender/editors/space_buttons/space_buttons.c
    branches/ge_dyn_load/source/blender/editors/space_console/console_ops.c
    branches/ge_dyn_load/source/blender/editors/space_console/space_console.c
    branches/ge_dyn_load/source/blender/editors/space_file/file_ops.c
    branches/ge_dyn_load/source/blender/editors/space_file/file_panels.c
    branches/ge_dyn_load/source/blender/editors/space_file/filelist.c
    branches/ge_dyn_load/source/blender/editors/space_file/filelist.h
    branches/ge_dyn_load/source/blender/editors/space_file/filesel.c
    branches/ge_dyn_load/source/blender/editors/space_file/space_file.c
    branches/ge_dyn_load/source/blender/editors/space_graph/graph_draw.c
    branches/ge_dyn_load/source/blender/editors/space_graph/graph_select.c
    branches/ge_dyn_load/source/blender/editors/space_graph/space_graph.c
    branches/ge_dyn_load/source/blender/editors/space_image/image_buttons.c
    branches/ge_dyn_load/source/blender/editors/space_image/image_ops.c
    branches/ge_dyn_load/source/blender/editors/space_image/space_image.c
    branches/ge_dyn_load/source/blender/editors/space_info/info_ops.c
    branches/ge_dyn_load/source/blender/editors/space_info/info_stats.c
    branches/ge_dyn_load/source/blender/editors/space_info/space_info.c
    branches/ge_dyn_load/source/blender/editors/space_logic/logic_window.c
    branches/ge_dyn_load/source/blender/editors/space_nla/nla_buttons.c
    branches/ge_dyn_load/source/blender/editors/space_nla/space_nla.c
    branches/ge_dyn_load/source/blender/editors/space_node/drawnode.c
    branches/ge_dyn_load/source/blender/editors/space_node/space_node.c
    branches/ge_dyn_load/source/blender/editors/space_outliner/outliner.c
    branches/ge_dyn_load/source/blender/editors/space_outliner/space_outliner.c
    branches/ge_dyn_load/source/blender/editors/space_script/script_edit.c
    branches/ge_dyn_load/source/blender/editors/space_script/script_ops.c
    branches/ge_dyn_load/source/blender/editors/space_sequencer/sequencer_add.c
    branches/ge_dyn_load/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/ge_dyn_load/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/ge_dyn_load/source/blender/editors/space_sequencer/sequencer_select.c
    branches/ge_dyn_load/source/blender/editors/space_sequencer/space_sequencer.c
    branches/ge_dyn_load/source/blender/editors/space_text/space_text.c
    branches/ge_dyn_load/source/blender/editors/space_text/text_intern.h
    branches/ge_dyn_load/source/blender/editors/space_text/text_ops.c
    branches/ge_dyn_load/source/blender/editors/space_time/space_time.c
    branches/ge_dyn_load/source/blender/editors/space_time/time_ops.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/drawarmature.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/drawobject.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/drawvolume.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/space_view3d.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_buttons.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_draw.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_edit.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_header.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_intern.h
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_select.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_snap.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_view.c
    branches/ge_dyn_load/source/blender/editors/transform/transform.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_conversions.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_generics.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_manipulator.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_ops.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_orientations.c
    branches/ge_dyn_load/source/blender/editors/util/editmode_undo.c
    branches/ge_dyn_load/source/blender/editors/util/undo.c
    branches/ge_dyn_load/source/blender/editors/uvedit/uvedit_ops.c
    branches/ge_dyn_load/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/ge_dyn_load/source/blender/gpu/CMakeLists.txt
    branches/ge_dyn_load/source/blender/gpu/GPU_draw.h
    branches/ge_dyn_load/source/blender/gpu/SConscript
    branches/ge_dyn_load/source/blender/gpu/intern/Makefile
    branches/ge_dyn_load/source/blender/gpu/intern/gpu_draw.c
    branches/ge_dyn_load/source/blender/gpu/intern/gpu_extensions.c
    branches/ge_dyn_load/source/blender/imbuf/CMakeLists.txt
    branches/ge_dyn_load/source/blender/imbuf/SConscript
    branches/ge_dyn_load/source/blender/imbuf/intern/anim.c
    branches/ge_dyn_load/source/blender/imbuf/intern/anim5.c
    branches/ge_dyn_load/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/ge_dyn_load/source/blender/imbuf/intern/cineon/SConscript
    branches/ge_dyn_load/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/ge_dyn_load/source/blender/imbuf/intern/dds/SConscript
    branches/ge_dyn_load/source/blender/imbuf/intern/hamx.c
    branches/ge_dyn_load/source/blender/imbuf/intern/iff.c
    branches/ge_dyn_load/source/blender/imbuf/intern/jp2.c
    branches/ge_dyn_load/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/ge_dyn_load/source/blender/imbuf/intern/openexr/SConscript
    branches/ge_dyn_load/source/blender/imbuf/intern/thumbs.c
    branches/ge_dyn_load/source/blender/imbuf/intern/writeimage.c
    branches/ge_dyn_load/source/blender/makesdna/DNA_action_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_cloth_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_constraint_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_curve_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_material_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_object_force.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_object_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_particle_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_smoke_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_space_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_texture_types.h
    branches/ge_dyn_load/source/blender/makesdna/SConscript
    branches/ge_dyn_load/source/blender/makesdna/intern/CMakeLists.txt
    branches/ge_dyn_load/source/blender/makesdna/intern/SConscript
    branches/ge_dyn_load/source/blender/makesrna/RNA_access.h
    branches/ge_dyn_load/source/blender/makesrna/RNA_define.h
    branches/ge_dyn_load/source/blender/makesrna/RNA_enum_types.h
    branches/ge_dyn_load/source/blender/makesrna/RNA_types.h
    branches/ge_dyn_load/source/blender/makesrna/SConscript
    branches/ge_dyn_load/source/blender/makesrna/intern/CMakeLists.txt
    branches/ge_dyn_load/source/blender/makesrna/intern/SConscript
    branches/ge_dyn_load/source/blender/makesrna/intern/makesrna.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_access.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_armature.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_boid.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_brush.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_cloth.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_constraint.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_curve.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_define.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_fluidsim.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_gpencil.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_group.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_internal.h
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_internal_types.h
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_key.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_lattice.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_main.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_material.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_mesh.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_mesh_api.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_meta.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_modifier.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_nodetree.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_object.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_object_force.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_particle.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_pose.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_render.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_rna.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_scene.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_sequence.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_smoke.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_space.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_texture.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_ui_api.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_wm.c
    branches/ge_dyn_load/source/blender/nodes/CMP_node.h
    branches/ge_dyn_load/source/blender/nodes/CMakeLists.txt
    branches/ge_dyn_load/source/blender/nodes/SConscript
    branches/ge_dyn_load/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
    branches/ge_dyn_load/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
    branches/ge_dyn_load/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
    branches/ge_dyn_load/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
    branches/ge_dyn_load/source/blender/nodes/intern/CMP_util.c
    branches/ge_dyn_load/source/blender/nodes/intern/CMP_util.h
    branches/ge_dyn_load/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
    branches/ge_dyn_load/source/blender/python/CMakeLists.txt
    branches/ge_dyn_load/source/blender/python/SConscript
    branches/ge_dyn_load/source/blender/python/generic/Geometry.c
    branches/ge_dyn_load/source/blender/python/generic/Mathutils.c
    branches/ge_dyn_load/source/blender/python/generic/matrix.c
    branches/ge_dyn_load/source/blender/python/generic/vector.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_array.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_interface.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_rna.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_rna.h
    branches/ge_dyn_load/source/blender/quicktime/CMakeLists.txt
    branches/ge_dyn_load/source/blender/quicktime/SConscript
    branches/ge_dyn_load/source/blender/readblenfile/CMakeLists.txt
    branches/ge_dyn_load/source/blender/readblenfile/SConscript
    branches/ge_dyn_load/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/ge_dyn_load/source/blender/render/CMakeLists.txt
    branches/ge_dyn_load/source/blender/render/intern/source/convertblender.c
    branches/ge_dyn_load/source/blender/render/intern/source/envmap.c
    branches/ge_dyn_load/source/blender/render/intern/source/initrender.c
    branches/ge_dyn_load/source/blender/render/intern/source/pixelshading.c
    branches/ge_dyn_load/source/blender/render/intern/source/shadbuf.c
    branches/ge_dyn_load/source/blender/render/intern/source/shadeinput.c
    branches/ge_dyn_load/source/blender/render/intern/source/shadeoutput.c
    branches/ge_dyn_load/source/blender/render/intern/source/strand.c
    branches/ge_dyn_load/source/blender/render/intern/source/texture.c
    branches/ge_dyn_load/source/blender/render/intern/source/volume_precache.c
    branches/ge_dyn_load/source/blender/render/intern/source/volumetric.c
    branches/ge_dyn_load/source/blender/render/intern/source/zbuf.c
    branches/ge_dyn_load/source/blender/windowmanager/CMakeLists.txt
    branches/ge_dyn_load/source/blender/windowmanager/WM_api.h
    branches/ge_dyn_load/source/blender/windowmanager/WM_types.h
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm.c
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm_event_system.c
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm_files.c
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm_jobs.c
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm_keymap.c
    branches/ge_dyn_load/source/blender/windowmanager/intern/wm_operators.c
    branches/ge_dyn_load/source/creator/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/BlenderRoutines/SConscript
    branches/ge_dyn_load/source/gameengine/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Converter/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/ge_dyn_load/source/gameengine/Converter/SConscript
    branches/ge_dyn_load/source/gameengine/Expressions/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Expressions/SConscript
    branches/ge_dyn_load/source/gameengine/GameLogic/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/GameLogic/SConscript
    branches/ge_dyn_load/source/gameengine/GamePlayer/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/ge_dyn_load/source/gameengine/GamePlayer/common/GPC_Engine.h
    branches/ge_dyn_load/source/gameengine/GamePlayer/common/SConscript
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/ge_dyn_load/source/gameengine/GamePlayer/ghost/SConscript
    branches/ge_dyn_load/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Ketsji/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/ge_dyn_load/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/ge_dyn_load/source/gameengine/Ketsji/KX_NearSensor.h
    branches/ge_dyn_load/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_dyn_load/source/gameengine/Ketsji/SConscript
    branches/ge_dyn_load/source/gameengine/Network/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Network/LoopBackNetwork/SConscript
    branches/ge_dyn_load/source/gameengine/Network/SConscript
    branches/ge_dyn_load/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Physics/Bullet/SConscript
    branches/ge_dyn_load/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Physics/Dummy/SConscript
    branches/ge_dyn_load/source/gameengine/Physics/common/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Physics/common/SConscript
    branches/ge_dyn_load/source/gameengine/Rasterizer/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/ge_dyn_load/source/gameengine/Rasterizer/SConscript
    branches/ge_dyn_load/source/gameengine/SceneGraph/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/SceneGraph/SConscript
    branches/ge_dyn_load/source/gameengine/VideoTexture/CMakeLists.txt
    branches/ge_dyn_load/source/gameengine/VideoTexture/SConscript
    branches/ge_dyn_load/source/kernel/CMakeLists.txt
    branches/ge_dyn_load/source/kernel/SConscript
    branches/ge_dyn_load/source/nan_compile.mk
    branches/ge_dyn_load/source/nan_definitions.mk
    branches/ge_dyn_load/source/nan_link.mk
    branches/ge_dyn_load/source/nan_warn.mk
    branches/ge_dyn_load/tools/btools.py

Added Paths:
-----------
    branches/ge_dyn_load/release/test/
    branches/ge_dyn_load/release/windows/inno/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Node/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Options/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Platform/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Scanner/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Script/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Tool/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Variables/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/compat/
    branches/ge_dyn_load/source/blender/editors/mesh/loopcut.c

Removed Paths:
-------------
    branches/ge_dyn_load/scons/scons-local-1.1.0/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Node/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Options/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Platform/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Scanner/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Script/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Tool/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Tool/MSCommon/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Tool/packaging/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/Variables/
    branches/ge_dyn_load/scons/scons-local-1.2.0.d20090223/SCons/compat/
    branches/ge_dyn_load/source/blender/blenlib/MTC_matrixops.h
    branches/ge_dyn_load/source/blender/blenlib/MTC_vectorops.h
    branches/ge_dyn_load/source/blender/blenlib/intern/matrixops.c
    branches/ge_dyn_load/source/blender/blenlib/intern/vectorops.c
    branches/ge_dyn_load/source/blender/editors/metaball/editmball.c
    branches/ge_dyn_load/source/blender/editors/object/editconstraint.c
    branches/ge_dyn_load/source/blender/editors/object/editgroup.c
    branches/ge_dyn_load/source/blender/editors/object/editkey.c
    branches/ge_dyn_load/source/blender/editors/object/editlattice.c

Modified: branches/ge_dyn_load/CMakeLists.txt
===================================================================
--- branches/ge_dyn_load/CMakeLists.txt	2009-09-25 05:30:07 UTC (rev 23477)
+++ branches/ge_dyn_load/CMakeLists.txt	2009-09-25 07:20:32 UTC (rev 23478)
@@ -34,11 +34,11 @@
 MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
 Remove the CMakeCache.txt file and try again from another folder, e.g.: 
 
-   rm CMakeCache.txt 
-   cd ..
-   mkdir cmake-make 
-   cd cmake-make
-   cmake -G \"Unix Makefiles\" ../blender
+	rm CMakeCache.txt 
+	cd ..
+	mkdir cmake-make 
+	cd cmake-make
+	cmake -G \"Unix Makefiles\" ../blender
 ")
 ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 
@@ -76,7 +76,7 @@
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-  MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
+	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
@@ -95,421 +95,421 @@
 #Platform specifics
 
 IF(UNIX AND NOT APPLE)
-  IF(WITH_OPENAL)
-    FIND_PACKAGE(OpenAL)
-    IF(OPENAL_FOUND)
-      SET(WITH_OPENAL ON)
-    ELSE(OPENAL_FOUND)
-      SET(WITH_OPENAL OFF)
-    ENDIF(OPENAL_FOUND)
-  ENDIF(WITH_OPENAL)
+	IF(WITH_OPENAL)
+		FIND_PACKAGE(OpenAL)
+		IF(OPENAL_FOUND)
+			SET(WITH_OPENAL ON)
+		ELSE(OPENAL_FOUND)
+			SET(WITH_OPENAL OFF)
+		ENDIF(OPENAL_FOUND)
+	ENDIF(WITH_OPENAL)
 
-  IF(WITH_JACK)
-    SET(JACK /usr)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
+	IF(WITH_JACK)
+		SET(JACK /usr)
+		SET(JACK_INC ${JACK}/include/jack)
+		SET(JACK_LIB jack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
 
-  IF(WITH_SNDFILE)
+	IF(WITH_SNDFILE)
 	SET(SNDFILE /usr)
 	SET(SNDFILE_INC ${SNDFILE}/include)
 	SET(SNDFILE_LIB sndfile)
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
+	ENDIF(WITH_SNDFILE)
 
-  FIND_LIBRARY(INTL_LIBRARY
-    NAMES intl
-    PATHS
-    /sw/lib
-  )
-  FIND_LIBRARY(ICONV_LIBRARY
-    NAMES iconv
-    PATHS
-    /sw/lib
-  )
+	FIND_LIBRARY(INTL_LIBRARY
+		NAMES intl
+		PATHS
+		/sw/lib
+	)
+	FIND_LIBRARY(ICONV_LIBRARY
+		NAMES iconv
+		PATHS
+		/sw/lib
+	)
   
-  IF(INTL_LIBRARY AND ICONV_LIBRARY)
-    SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
-  ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
+	IF(INTL_LIBRARY AND ICONV_LIBRARY)
+		SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
+	ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
 
-  FIND_PACKAGE(Freetype)
-  # UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
+	FIND_PACKAGE(Freetype)
+	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
-  # No way to set py31. remove for now.
-  # FIND_PACKAGE(PythonLibs)
-  SET(PYTHON /usr)
-  SET(PYTHON_VERSION 3.1)
-  SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-  # SET(PYTHON_BINARY python) # not used yet
-  SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-  SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	# No way to set py31. remove for now.
+	# FIND_PACKAGE(PythonLibs)
+	SET(PYTHON /usr)
+	SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+	# SET(PYTHON_BINARY python) # not used yet
+	SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+	SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
   
-  # FIND_PACKAGE(PythonInterp) # not used yet
-  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+	# FIND_PACKAGE(PythonInterp) # not used yet
+	# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
   
-  SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
-  IF(WITH_SDL)
-    FIND_PACKAGE(SDL)
-    # UNSET(SDLMAIN_LIBRARY CACHE)
-    IF(NOT SDL_FOUND)
-      SET(WITH_SDL OFF)
-    ENDIF(NOT SDL_FOUND)
-  ENDIF(WITH_SDL)
+	IF(WITH_SDL)
+		FIND_PACKAGE(SDL)
+		# UNSET(SDLMAIN_LIBRARY CACHE)
+		IF(NOT SDL_FOUND)
+			SET(WITH_SDL OFF)
+		ENDIF(NOT SDL_FOUND)
+	ENDIF(WITH_SDL)
 
-  FIND_PATH(OPENEXR_INC
-    ImfXdr.h
-    PATHS
-    /usr/local/include/OpenEXR
-    /usr/include/OpenEXR
-    /sw/include/OpenEXR
-    /opt/local/include/OpenEXR
-    /opt/csw/include/OpenEXR
-    /opt/include/OpenEXR
-  )
-  SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	FIND_PATH(OPENEXR_INC
+		ImfXdr.h
+		PATHS
+		/usr/local/include/OpenEXR
+		/usr/include/OpenEXR
+		/sw/include/OpenEXR
+		/opt/local/include/OpenEXR
+		/opt/csw/include/OpenEXR
+		/opt/include/OpenEXR
+	)
+	SET(OPENEXR_LIB Half IlmImf Iex Imath)
 
-  SET(FFMPEG /usr)
-  SET(FFMPEG_INC ${FFMPEG}/include)
-  SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
-  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	SET(FFMPEG /usr)
+	SET(FFMPEG_INC ${FFMPEG}/include)
+	SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
+	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
   
-  IF(WITH_FFTW3)
-    SET(FFTW3 /usr)
-    SET(FFTW3_INC ${FFTW3}/include)
-    SET(FFTW3_LIB fftw3)
-    SET(FFTW3_LIBPATH ${FFTW3}/lib)
-  ENDIF(WITH_FFTW3)
+	IF(WITH_FFTW3)
+		SET(FFTW3 /usr)
+		SET(FFTW3_INC ${FFTW3}/include)
+		SET(FFTW3_LIB fftw3)
+		SET(FFTW3_LIBPATH ${FFTW3}/lib)
+	ENDIF(WITH_FFTW3)
 
-  SET(LIBSAMPLERATE /usr)
-  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-  SET(LIBSAMPLERATE_LIB samplerate)
-  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+	SET(LIBSAMPLERATE /usr)
+	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+	SET(LIBSAMPLERATE_LIB samplerate)
+	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-  FIND_PACKAGE(JPEG REQUIRED)
+	FIND_PACKAGE(JPEG REQUIRED)
 
-  FIND_PACKAGE(PNG REQUIRED)
+	FIND_PACKAGE(PNG REQUIRED)
 
-  FIND_PACKAGE(ZLIB REQUIRED)
+	FIND_PACKAGE(ZLIB REQUIRED)
 
-  # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
-  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+	# Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
+	SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
 
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    # BSD's dont use libdl.so
-    SET(LLIBS "${LLIBS} -ldl")
-  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+		# BSD's dont use libdl.so
+		SET(LLIBS "${LLIBS} -ldl")
+	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-  IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
-  ENDIF(WITH_OPENMP)
+	IF(WITH_OPENMP)
+		SET(LLIBS "${LLIBS} -lgomp")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+	ENDIF(WITH_OPENMP)
 
 
-  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
+	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
 
-  SET(PLATFORM_LINKFLAGS "-pthread")
+	SET(PLATFORM_LINKFLAGS "-pthread")
 
-  # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
-  SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+	# Better warnings
+	SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+	SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
-  INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+	INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
 
 IF(WIN32)
 
-  # this file is included anyway when building under Windows with cl.exe
-  #  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+	# this file is included anyway when building under Windows with cl.exe
+	#  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
   
-  SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
 
-  # Setup 64bit and 64bit windows systems
-  IF(CMAKE_CL_64)
-    message("64 bit compiler detected.")
-    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
-  ENDIF(CMAKE_CL_64)
+	# Setup 64bit and 64bit windows systems
+	IF(CMAKE_CL_64)
+		message("64 bit compiler detected.")
+		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+	ENDIF(CMAKE_CL_64)
 
-  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)
+	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)
 
-  IF(CMAKE_CL_64)
-    SET(WITH_OPENAL OFF)
-  ELSE(CMAKE_CL_64)
-    #SET(WITH_OPENAL ON)
-    SET(OPENAL ${LIBDIR}/openal)
-    SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-    SET(OPENAL_LIBRARY wrap_oal)
-    SET(OPENAL_LIBPATH ${OPENAL}/lib)
-  ENDIF(CMAKE_CL_64)
+	IF(CMAKE_CL_64)
+		SET(WITH_OPENAL OFF)
+	ELSE(CMAKE_CL_64)
+		#SET(WITH_OPENAL ON)
+		SET(OPENAL ${LIBDIR}/openal)
+		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+		SET(OPENAL_LIBRARY wrap_oal)
+		SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	ENDIF(CMAKE_CL_64)
 
-  IF(WITH_JACK)
-    SET(JACK ${LIBDIR}/jack)
-    SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
-    SET(JACK_LIB libjack)
-    SET(JACK_LIBPATH ${JACK}/lib)
-  ENDIF(WITH_JACK)
+	IF(WITH_JACK)
+		SET(JACK ${LIBDIR}/jack)
+		SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+		SET(JACK_LIB libjack)
+		SET(JACK_LIBPATH ${JACK}/lib)
+	ENDIF(WITH_JACK)
 
-  IF(WITH_SNDFILE)
-	SET(SNDFILE ${LIBDIR}/sndfile)
-	SET(SNDFILE_INC ${SNDFILE}/include)
-	SET(SNDFILE_LIB libsndfile-1)
-	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-  ENDIF(WITH_SNDFILE)
+	IF(WITH_SNDFILE)
+		SET(SNDFILE ${LIBDIR}/sndfile)
+		SET(SNDFILE_INC ${SNDFILE}/include)
+		SET(SNDFILE_LIB libsndfile-1)
+		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+	ENDIF(WITH_SNDFILE)
 
-  IF(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng)
-  ELSE(CMAKE_CL_64)
-    SET(PNG_LIBRARIES libpng_st)
-  ENDIF(CMAKE_CL_64)
-  SET(JPEG_LIBRARY libjpeg)
+	IF(CMAKE_CL_64)
+		SET(PNG_LIBRARIES libpng)
+	ELSE(CMAKE_CL_64)
+		SET(PNG_LIBRARIES libpng_st)
+	ENDIF(CMAKE_CL_64)
+	SET(JPEG_LIBRARY libjpeg)
 
-  SET(ZLIB ${LIBDIR}/zlib)
-  SET(ZLIB_INC ${ZLIB}/include)
-  IF(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES libz)
-  ELSE(CMAKE_CL_64)
-    SET(ZLIB_LIBRARIES zlib)
-  ENDIF(CMAKE_CL_64)
-  SET(ZLIB_LIBPATH ${ZLIB}/lib)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list