Undo revision 23130 which was a merge with 2.5, a messy one because I did something... soc-2009-kazanbas
authorArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 15 Sep 2009 18:01:18 +0000 (18:01 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 15 Sep 2009 18:01:18 +0000 (18:01 +0000)
The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas

806 files changed:
1  2 
CMake/macros.cmake
CMakeLists.txt
SConstruct
blenderplayer/CMakeLists.txt
config/darwin-config.py
config/linux2-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
config/win64-vc-config.py
extern/CMakeLists.txt
extern/Makefile
extern/SConscript
extern/binreloc/SConscript
extern/bullet2/CMakeLists.txt
extern/bullet2/src/BulletCollision/CMakeLists.txt
extern/bullet2/src/BulletSoftBody/CMakeLists.txt
extern/bullet2/src/SConscript
extern/glew/CMakeLists.txt
extern/glew/SConscript
extern/libopenjpeg/SConscript
extern/libredcode/SConscript
extern/lzma/Alloc.c
extern/lzma/Alloc.h
extern/lzma/CMakeLists.txt
extern/lzma/LzFind.c
extern/lzma/LzFind.h
extern/lzma/LzHash.h
extern/lzma/LzmaDec.c
extern/lzma/LzmaDec.h
extern/lzma/LzmaEnc.c
extern/lzma/LzmaEnc.h
extern/lzma/LzmaLib.c
extern/lzma/LzmaLib.h
extern/lzma/Makefile
extern/lzma/SConscript
extern/lzma/Types.h
extern/lzma/history.txt
extern/lzma/lzma.txt
extern/lzma/make/msvc_9_0/lzma.vcproj
extern/lzo/CMakeLists.txt
extern/lzo/SConscript
extern/lzo/make/msvc_9_0/lzo.vcproj
extern/lzo/minilzo/COPYING
extern/lzo/minilzo/Makefile
extern/lzo/minilzo/README.LZO
extern/lzo/minilzo/lzoconf.h
extern/lzo/minilzo/lzodefs.h
extern/lzo/minilzo/minilzo.c
extern/lzo/minilzo/minilzo.h
intern/CMakeLists.txt
intern/audaspace/CMakeLists.txt
intern/audaspace/FX/AUD_DoubleReader.cpp
intern/audaspace/FX/AUD_PingPongFactory.cpp
intern/audaspace/Makefile
intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
intern/audaspace/SConscript
intern/audaspace/SDL/AUD_SDLMixerReader.cpp
intern/audaspace/SDL/Makefile
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
intern/audaspace/ffmpeg/Makefile
intern/audaspace/intern/AUD_C-API.cpp
intern/audaspace/intern/Makefile
intern/audaspace/jack/AUD_JackDevice.cpp
intern/audaspace/jack/AUD_JackDevice.h
intern/audaspace/jack/Makefile
intern/audaspace/make/msvc_9_0/audaspace.vcproj
intern/audaspace/sndfile/AUD_SndFileFactory.cpp
intern/audaspace/sndfile/AUD_SndFileFactory.h
intern/audaspace/sndfile/AUD_SndFileReader.cpp
intern/audaspace/sndfile/AUD_SndFileReader.h
intern/audaspace/sndfile/Makefile
intern/elbeem/CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/SConscript
intern/ghost/intern/GHOST_System.cpp
intern/guardedalloc/CMakeLists.txt
intern/guardedalloc/SConscript
intern/iksolver/SConscript
intern/iksolver/intern/TNT/tntmath.h
intern/memutil/SConscript
intern/moto/SConscript
intern/smoke/CMakeLists.txt
intern/smoke/extern/smoke_API.h
intern/smoke/intern/FLUID_3D.cpp
intern/smoke/intern/FLUID_3D.h
intern/smoke/intern/FLUID_3D_SOLVERS.cpp
intern/smoke/intern/FLUID_3D_STATIC.cpp
intern/smoke/intern/WTURBULENCE.cpp
intern/smoke/intern/WTURBULENCE.h
intern/smoke/intern/smoke_API.cpp
intern/smoke/intern/tnt/tnt_math_utils.h
intern/string/SConscript
intern/string/STR_String.h
projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
projectfiles_vc9/blender/blender.sln
projectfiles_vc9/blender/blender.vcproj
projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
projectfiles_vc9/blender/editors/ED_editors.vcproj
projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
projectfiles_vc9/blender/render/BRE_render.vcproj
projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
release/datafiles/blenderbuttons
release/datafiles/datatoc.c
release/datafiles/splash.jpg
release/io/engine_render_pov.py
release/io/export_ply.py
release/io/netrender/__init__.py
release/io/netrender/client.py
release/io/netrender/master.py
release/io/netrender/model.py
release/io/netrender/operators.py
release/io/netrender/slave.py
release/io/netrender/ui.py
release/io/netrender/utils.py
release/scripts/export_map.py
release/scripts/help_getting_started.py
release/scripts/help_manual.py
release/scripts/help_release_notes.py
release/scripts/help_tutorials.py
release/scripts/help_web_blender.py
release/scripts/help_web_devcomm.py
release/scripts/help_web_eshop.py
release/scripts/help_web_usercomm.py
release/test/rna_array.py
release/ui/bpy_ops.py
release/ui/buttons_data_armature.py
release/ui/buttons_data_bone.py
release/ui/buttons_data_camera.py
release/ui/buttons_data_curve.py
release/ui/buttons_data_empty.py
release/ui/buttons_data_lamp.py
release/ui/buttons_data_lattice.py
release/ui/buttons_data_mesh.py
release/ui/buttons_data_metaball.py
release/ui/buttons_data_modifier.py
release/ui/buttons_data_text.py
release/ui/buttons_game.py
release/ui/buttons_material.py
release/ui/buttons_object.py
release/ui/buttons_object_constraint.py
release/ui/buttons_physics_cloth.py
release/ui/buttons_physics_field.py
release/ui/buttons_physics_fluid.py
release/ui/buttons_physics_smoke.py
release/ui/buttons_physics_softbody.py
release/ui/buttons_scene.py
release/ui/buttons_texture.py
release/ui/buttons_world.py
release/ui/space_buttons.py
release/ui/space_console.py
release/ui/space_filebrowser.py
release/ui/space_image.py
release/ui/space_info.py
release/ui/space_logic.py
release/ui/space_node.py
release/ui/space_outliner.py
release/ui/space_sequencer.py
release/ui/space_text.py
release/ui/space_time.py
release/ui/space_userpref.py
release/ui/space_view3d.py
release/ui/space_view3d_toolbar.py
release/windows/inno/blender.iss
release/windows/inno/copyright.txt
release/windows/inno/header.bmp
release/windows/inno/installer.bmp
release/windows/inno/installer.ico
source/CMakeLists.txt
source/Makefile
source/SConscript
source/blender/CMakeLists.txt
source/blender/avi/CMakeLists.txt
source/blender/avi/SConscript
source/blender/blenfont/CMakeLists.txt
source/blender/blenfont/SConscript
source/blender/blenfont/intern/blf_font.c
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/BKE_animsys.h
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_brush.h
source/blender/blenkernel/BKE_constraint.h
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/BKE_depsgraph.h
source/blender/blenkernel/BKE_global.h
source/blender/blenkernel/BKE_group.h
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_multires.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/BKE_sca.h
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/BKE_sculpt.h
source/blender/blenkernel/BKE_shrinkwrap.h
source/blender/blenkernel/BKE_smoke.h
source/blender/blenkernel/BKE_sound.h
source/blender/blenkernel/BKE_text.h
source/blender/blenkernel/BKE_texture.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/Makefile
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/booleanops.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/packedFile.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/sequence.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/sound.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/texture.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/BLI_kdopbvh.h
source/blender/blenlib/BLI_voxel.h
source/blender/blenlib/BLI_winstuff.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/MTC_matrixops.h
source/blender/blenlib/MTC_vectorops.h
source/blender/blenlib/SConscript
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/arithb.c
source/blender/blenlib/intern/bpath.c
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/freetypefont.c
source/blender/blenlib/intern/matrixops.c
source/blender/blenlib/intern/storage.c
source/blender/blenlib/intern/threads.c
source/blender/blenlib/intern/util.c
source/blender/blenlib/intern/vectorops.c
source/blender/blenlib/intern/voxel.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/SConscript
source/blender/blenloader/intern/readblenentry.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/writefile.c
source/blender/blenpluginapi/CMakeLists.txt
source/blender/blenpluginapi/SConscript
source/blender/editors/CMakeLists.txt
source/blender/editors/Makefile
source/blender/editors/SConscript
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/anim_intern.h
source/blender/editors/animation/anim_ipo_utils.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/animation/drivers.c
source/blender/editors/animation/fmodifier_ui.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/animation/keyframes_general.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_generate.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/armature/poselib.c
source/blender/editors/armature/poseobject.c
source/blender/editors/curve/curve_ops.c
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editfont.c
source/blender/editors/datafiles/blenderbuttons.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/gpencil_buttons.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/gpencil/gpencil_intern.h
source/blender/editors/gpencil/gpencil_ops.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_fileselect.h
source/blender/editors/include/ED_gpencil.h
source/blender/editors/include/ED_info.h
source/blender/editors/include/ED_keyframes_draw.h
source/blender/editors/include/ED_keyframes_edit.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/include/ED_mball.h
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_particle.h
source/blender/editors/include/ED_screen.h
source/blender/editors/include/ED_sound.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/include/UI_icons.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_anim.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/mesh/editmesh_loop.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_layers.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/metaball/editmball.c
source/blender/editors/object/editconstraint.c
source/blender/editors/object/editgroup.c
source/blender/editors/object/editkey.c
source/blender/editors/object/editlattice.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/physics/ed_fluidsim.c
source/blender/editors/physics/ed_pointcache.c
source/blender/editors/physics/editparticle.c
source/blender/editors/preview/previewrender.c
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_context.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_intern.h
source/blender/editors/sculpt_paint/sculpt_stroke.c
source/blender/editors/sound/Makefile
source/blender/editors/sound/SConscript
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_header.c
source/blender/editors/space_action/action_intern.h
source/blender/editors/space_action/action_ops.c
source/blender/editors/space_action/space_action.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_buttons/buttons_intern.h
source/blender/editors/space_buttons/buttons_ops.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_console/console_ops.c
source/blender/editors/space_console/console_report.c
source/blender/editors/space_console/space_console.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_intern.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_header.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_intern.h
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_logic/space_logic.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_nla/nla_header.c
source/blender/editors/space_nla/space_nla.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_outliner/space_outliner.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_text/text_intern.h
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_time/time_header.c
source/blender/editors/space_view3d/SConscript
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_ops.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/util/editmode_undo.c
source/blender/editors/util/undo.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_draw.h
source/blender/gpu/GPU_extensions.h
source/blender/gpu/SConscript
source/blender/gpu/intern/Makefile
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/SConscript
source/blender/imbuf/intern/anim5.c
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/cineon/SConscript
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/dds/SConscript
source/blender/imbuf/intern/hamx.c
source/blender/imbuf/intern/iff.c
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/imbuf/intern/openexr/Makefile
source/blender/imbuf/intern/openexr/SConscript
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/imbuf/intern/thumbs.c
source/blender/imbuf/intern/writeimage.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_brush_types.h
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_curve_types.h
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_sensor_types.h
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesdna/DNA_sound_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/makesdna/SConscript
source/blender/makesdna/intern/CMakeLists.txt
source/blender/makesdna/intern/SConscript
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_define.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/Makefile
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_action_api.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_animation_api.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_boid.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_cloth.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_gpencil.c
source/blender/makesrna/intern/rna_group.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_internal_types.h
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_lattice.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_material_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_mesh_api.c
source/blender/makesrna/intern/rna_meta.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nla.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_packedfile.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_pose_api.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_sequence.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_sound.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_test.c
source/blender/makesrna/intern/rna_texture.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/makesrna/intern/rna_world.c
source/blender/nodes/CMP_node.h
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript
source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
source/blender/nodes/intern/CMP_nodes/CMP_levels.c
source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
source/blender/nodes/intern/CMP_util.c
source/blender/nodes/intern/CMP_util.h
source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
source/blender/nodes/intern/TEX_util.c
source/blender/nodes/intern/TEX_util.h
source/blender/python/CMakeLists.txt
source/blender/python/SConscript
source/blender/python/epy_doc_gen.py
source/blender/python/generic/bpy_internal_import.h
source/blender/python/generic/matrix.c
source/blender/python/generic/vector.c
source/blender/python/intern/bpy_array.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_operator.c
source/blender/python/intern/bpy_operator_wrap.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna.h
source/blender/python/intern/bpy_util.c
source/blender/python/intern/bpy_util.h
source/blender/quicktime/CMakeLists.txt
source/blender/quicktime/SConscript
source/blender/readblenfile/CMakeLists.txt
source/blender/readblenfile/SConscript
source/blender/readblenfile/intern/BLO_readblenfile.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/include/shading.h
source/blender/render/intern/include/texture.h
source/blender/render/intern/include/volumetric.h
source/blender/render/intern/include/voxeldata.h
source/blender/render/intern/source/Makefile
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/occlusion.c
source/blender/render/intern/source/pixelshading.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/raytrace.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/shadbuf.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/texture.c
source/blender/render/intern/source/volume_precache.c
source/blender/render/intern/source/volumetric.c
source/blender/render/intern/source/voxeldata.c
source/blender/render/intern/source/zbuf.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/Makefile
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/Makefile
source/blenderplayer/bad_level_call_stubs/SConscript
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/Makefile
source/creator/SConscript
source/creator/creator.c
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
source/gameengine/BlenderRoutines/KX_BlenderGL.h
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/BlenderRoutines/SConscript
source/gameengine/CMakeLists.txt
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.h
source/gameengine/Converter/BL_ShapeDeformer.cpp
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
source/gameengine/Converter/KX_BlenderScalarInterpolator.h
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/KX_ConvertProperties.cpp
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Converter/KX_IpoConvert.cpp
source/gameengine/Converter/SConscript
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/Expressions/ListValue.cpp
source/gameengine/Expressions/ListValue.h
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Expressions/SConscript
source/gameengine/Expressions/Value.cpp
source/gameengine/Expressions/Value.h
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.h
source/gameengine/GameLogic/SCA_DelaySensor.cpp
source/gameengine/GameLogic/SCA_DelaySensor.h
source/gameengine/GameLogic/SCA_IController.cpp
source/gameengine/GameLogic/SCA_IController.h
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
source/gameengine/GameLogic/SCA_ILogicBrick.h
source/gameengine/GameLogic/SCA_ISensor.cpp
source/gameengine/GameLogic/SCA_ISensor.h
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.h
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.h
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.h
source/gameengine/GameLogic/SCA_PropertyActuator.cpp
source/gameengine/GameLogic/SCA_PropertyActuator.h
source/gameengine/GameLogic/SCA_PropertyEventManager.h
source/gameengine/GameLogic/SCA_PropertySensor.cpp
source/gameengine/GameLogic/SCA_PropertySensor.h
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_RandomActuator.cpp
source/gameengine/GameLogic/SCA_RandomActuator.h
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/GameLogic/SCA_RandomSensor.h
source/gameengine/GameLogic/SConscript
source/gameengine/GamePlayer/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/common/GPC_Engine.cpp
source/gameengine/GamePlayer/common/GPC_Engine.h
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.h
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
source/gameengine/Ketsji/KXNetwork/SConscript
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_Camera.h
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_CameraActuator.h
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
source/gameengine/Ketsji/KX_ConstraintActuator.h
source/gameengine/Ketsji/KX_GameActuator.cpp
source/gameengine/Ketsji/KX_GameActuator.h
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_IpoActuator.cpp
source/gameengine/Ketsji/KX_IpoActuator.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.h
source/gameengine/Ketsji/KX_ObjectActuator.cpp
source/gameengine/Ketsji/KX_ObjectActuator.h
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_ParentActuator.h
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Ketsji/KX_PyMath.cpp
source/gameengine/Ketsji/KX_PyMath.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_PythonInitTypes.cpp
source/gameengine/Ketsji/KX_PythonSeq.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RadarSensor.h
source/gameengine/Ketsji/KX_RaySensor.cpp
source/gameengine/Ketsji/KX_RaySensor.h
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_SceneActuator.cpp
source/gameengine/Ketsji/KX_SceneActuator.h
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_SoundActuator.h
source/gameengine/Ketsji/KX_StateActuator.cpp
source/gameengine/Ketsji/KX_StateActuator.h
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_TouchSensor.h
source/gameengine/Ketsji/KX_TrackToActuator.cpp
source/gameengine/Ketsji/KX_TrackToActuator.h
source/gameengine/Ketsji/KX_VisibilityActuator.cpp
source/gameengine/Ketsji/KX_VisibilityActuator.h
source/gameengine/Ketsji/SConscript
source/gameengine/Network/CMakeLists.txt
source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
source/gameengine/Network/LoopBackNetwork/SConscript
source/gameengine/Network/SConscript
source/gameengine/Physics/Bullet/CMakeLists.txt
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
source/gameengine/Physics/Bullet/SConscript
source/gameengine/Physics/Dummy/CMakeLists.txt
source/gameengine/Physics/Dummy/SConscript
source/gameengine/Physics/common/CMakeLists.txt
source/gameengine/Physics/common/SConscript
source/gameengine/PyDoc/GameLogic.py
source/gameengine/PyDoc/GameTypes.py
source/gameengine/Rasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
source/gameengine/Rasterizer/RAS_MaterialBucket.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
source/gameengine/Rasterizer/RAS_Polygon.cpp
source/gameengine/Rasterizer/RAS_Polygon.h
source/gameengine/Rasterizer/SConscript
source/gameengine/SceneGraph/CMakeLists.txt
source/gameengine/SceneGraph/SConscript
source/gameengine/VideoTexture/CMakeLists.txt
source/gameengine/VideoTexture/Exception.cpp
source/gameengine/VideoTexture/ImageBase.cpp
source/gameengine/VideoTexture/SConscript
source/icons/SConscript
source/kernel/CMakeLists.txt
source/kernel/SConscript
source/nan_definitions.mk
tools/Blender.py
tools/btools.py

@@@ -70,9 -70,9 +70,6 @@@ MACRO(SETUP_LIBDIRS
    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)
@@@ -121,9 -121,9 +118,6 @@@ MACRO(SETUP_LIBLINK
    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)
diff --cc CMakeLists.txt
@@@ -34,11 -34,11 +34,11 @@@ IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE
  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})
  
@@@ -70,13 -70,13 +70,11 @@@ OPTION(WITH_OPENMP        "Enable OpenM
  OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
  OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
  OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
--OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
--OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
--# OPTION(WITH_BUILDINFO     "Include extra build details" ON)
++OPTION(WITH_CXX_GUARDEDALLOC "" OFF)
  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,434 -95,434 +93,398 @@@ INCLUDE(CMake/macros.cmake
  #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_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)
--      SET(SNDFILE /usr)
--      SET(SNDFILE_INC ${SNDFILE}/include)
--      SET(SNDFILE_LIB sndfile)
--      SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
--      ENDIF(WITH_SNDFILE)
--
--      FIND_LIBRARY(INTL_LIBRARY
--              NAMES intl
--              PATHS
--              /sw/lib
--      )
--      FIND_LIBRARY(ICONV_LIBRARY
--              NAMES iconv
--              PATHS
--              /sw/lib
--      )
++  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)
++
++  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)
--
--      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 "")
++  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
++
++  # 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")
--
--      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)
--
--      SET(FFMPEG /usr)
--      SET(FFMPEG_INC ${FFMPEG}/include)
--      SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
--      SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
++  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)
++
++  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)
    
--      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 -Wnested-externs -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)
--
--      # 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)
--
--      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_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)
--
--      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)
++  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)
++
++  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(WITH_JACK)
++    SET(JACK ${LIBDIR}/jack)
++    SET(JACK_INC ${JACK}/include/jack)
++    SET(JACK_LIB jack)
++    SET(JACK_LIBPATH ${JACK}/lib)
++  ENDIF(WITH_JACK)
++
++  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)
++  SET(ZLIB_LIBRARIES zlib)
++  SET(ZLIB_LIBPATH ${ZLIB}/lib)
    
--      SET(PTHREADS ${LIBDIR}/pthreads)
--      SET(PTHREADS_INC ${PTHREADS}/include)
--      SET(PTHREADS_LIB pthreadVC2)
--      SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
++  SET(PTHREADS ${LIBDIR}/pthreads)
++  SET(PTHREADS_INC ${PTHREADS}/include)
++  SET(PTHREADS_LIB pthreadVC2)
++  SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
    
--      SET(ICONV ${LIBDIR}/iconv)
--      SET(ICONV_INC ${ICONV}/include)
--      SET(ICONV_LIB iconv)
--      SET(ICONV_LIBPATH ${ICONV}/lib)
++  SET(ICONV ${LIBDIR}/iconv)
++  SET(ICONV_INC ${ICONV}/include)
++  SET(ICONV_LIB iconv)
++  SET(ICONV_LIBPATH ${ICONV}/lib)
    
--      IF(WITH_FFTW3)
--              SET(FFTW3 ${LIBDIR}/fftw3)
--              SET(FFTW3_INC ${FFTW3}/include)
--              SET(FFTW3_LIB libfftw)
--              SET(FFTW3_LIBPATH ${FFTW3}/lib)
--      ENDIF(WITH_FFTW3)
++  IF(WITH_FFTW3)
++    SET(FFTW3 ${LIBDIR}/fftw3)
++    SET(FFTW3_INC ${FFTW3}/include)
++    SET(FFTW3_LIB libfftw)
++    SET(FFTW3_LIBPATH ${FFTW3}/lib)
++  ENDIF(WITH_FFTW3)
    
--      SET(GETTEXT ${LIBDIR}/gettext)
--      SET(GETTEXT_INC ${GETTEXT}/include)
--      IF(CMAKE_CL_64)
--              SET(GETTEXT_LIB gettext)
--      ELSE(CMAKE_CL_64)
--              SET(GETTEXT_LIB gnu_gettext)
--      ENDIF(CMAKE_CL_64)
--      SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
--
--      SET(FREETYPE ${LIBDIR}/freetype)
--      SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
--      SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
--      SET(FREETYPE_LIBRARY freetype2ST)
++  SET(GETTEXT ${LIBDIR}/gettext)
++  SET(GETTEXT_INC ${GETTEXT}/include)
++  IF(CMAKE_CL_64)
++    SET(GETTEXT_LIB gettextlib)
++  ELSE(CMAKE_CL_64)
++    SET(GETTEXT_LIB gnu_gettext)
++  ENDIF(CMAKE_CL_64)
++  SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
++
++  SET(FREETYPE ${LIBDIR}/freetype)
++  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
++  SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
++  SET(FREETYPE_LIBRARY freetype2ST)
    
--      SET(OPENEXR ${LIBDIR}/openexr)
--      SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
--      SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
--      IF (MSVC80)
--              SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
--      ELSE (MSVC80)
--              SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
--      ENDIF(MSVC80)
--      IF (MSVC90)
--              SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
--      ENDIF(MSVC90)
++  SET(OPENEXR ${LIBDIR}/openexr)
++  SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
++  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
++  IF (MSVC80)
++    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
++  ELSE (MSVC80)
++    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
++  ENDIF(MSVC80)
++  IF (MSVC90)
++    SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
++  ENDIF(MSVC90)
  
    
--      SET(QUICKTIME ${LIBDIR}/QTDevWin)
--      SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
--      SET(QUICKTIME_LIB qtmlClient)
--      SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
--
--      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)
--
--      SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
--      SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
--      SET(LIBSAMPLERATE_LIB libsamplerate)
--      SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
--
--      IF(CMAKE_CL_64)
--              SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
--      ELSE(CMAKE_CL_64)
--              SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
--      ENDIF(CMAKE_CL_64)
--
--      SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
--      SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
--      SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
--      SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
--      SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
--      SET(CMAKE_C_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
--      SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
--      SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
--
--      IF(WITH_OPENMP)
--              SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
--              SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
--      ENDIF(WITH_OPENMP)
--
--      SET(SDL ${LIBDIR}/sdl)
--      SET(SDL_INCLUDE_DIR ${SDL}/include)
--      SET(SDL_LIBRARY SDL)
--      SET(SDL_LIBPATH ${SDL}/lib)
--
--      SET(PNG "${LIBDIR}/png")
--      SET(PNG_INC "${PNG}/include")
--      SET(PNG_LIBPATH ${PNG}/lib)
--
--      SET(JPEG "${LIBDIR}/jpeg")
--      SET(JPEG_INC "${JPEG}/include")
--      SET(JPEG_LIBPATH ${JPEG}/lib)
--
--      SET(TIFF ${LIBDIR}/tiff)
--      SET(TIFF_INC ${TIFF}/include)
++  SET(QUICKTIME ${LIBDIR}/QTDevWin)
++  SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
++  SET(QUICKTIME_LIB qtmlClient)
++  SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
++
++  SET(FFMPEG ${LIBDIR}/ffmpeg)
++  SET(FFMPEG_INC ${FFMPEG}/include)
++  SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
++  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
++
++  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
++  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
++  SET(LIBSAMPLERATE_LIB libsamplerate)
++  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
++
++  IF(CMAKE_CL_64)
++    SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
++  ELSE(CMAKE_CL_64)
++    SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
++  ENDIF(CMAKE_CL_64)
++
++  SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
++  SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
++  SET(CMAKE_CXX_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
++  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
++  SET(CMAKE_C_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
++  SET(CMAKE_C_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
++  SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
++  SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
++
++  IF(WITH_OPENMP)
++    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
++  ENDIF(WITH_OPENMP)
++
++  SET(SDL ${LIBDIR}/sdl)
++  SET(SDL_INCLUDE_DIR ${SDL}/include)
++  SET(SDL_LIBRARY SDL)
++  SET(SDL_LIBPATH ${SDL}/lib)
++
++  SET(PNG "${LIBDIR}/png")
++  SET(PNG_INC "${PNG}/include")
++  SET(PNG_LIBPATH ${PNG}/lib)
++
++  SET(JPEG "${LIBDIR}/jpeg")
++  SET(JPEG_INC "${JPEG}/include")
++  SET(JPEG_LIBPATH ${JPEG}/lib)
++
++  SET(TIFF ${LIBDIR}/tiff)
++  SET(TIFF_INC ${TIFF}/include)
    
--      SET(WINTAB_INC ${LIBDIR}/wintab/include) 
++  SET(WINTAB_INC ${LIBDIR}/wintab/include) 
  
--      IF(CMAKE_CL_64)
--              SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
--      ELSE(CMAKE_CL_64)
--              SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
--      ENDIF(CMAKE_CL_64)
++  IF(CMAKE_CL_64)
++    SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
++  ELSE(CMAKE_CL_64)
++    SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
++  ENDIF(CMAKE_CL_64)
    
--      SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
++  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
  ENDIF(WIN32)
  
  IF(APPLE)
--      IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
--              SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
--      ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
--              SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
--      ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
--
--      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_SNDFILE)
--              SET(SNDFILE /usr)
--              SET(SNDFILE_INC ${SNDFILE}/include)
--              SET(SNDFILE_LIB sndfile)
--              SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
--      ENDIF(WITH_SNDFILE)
--
--      SET(PYTHON_VERSION 3.1)
--
--      IF(PYTHON_VERSION MATCHES 3.1)
--              # we use precompiled libraries for py 3.1 and up by default
--
--              SET(PYTHON ${LIBDIR}/python)
--              SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
--              # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
--              SET(PYTHON_LIB python${PYTHON_VERSION})
--              SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
--              #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
--      ELSE(PYTHON_VERSION MATCHES 3.1)
--              # otherwise, use custom system framework
--
--              SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
--              SET(PYTHON_VERSION 2.5)
--              SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
--              # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
--              SET(PYTHON_LIB "")
--              SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
--              SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
--      ENDIF(PYTHON_VERSION MATCHES 3.1)
--
--      SET(GETTEXT ${LIBDIR}/gettext)
--      SET(GETTEXT_INC "${GETTEXT}/include")
--      SET(GETTEXT_LIB intl iconv)
--      SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
++  IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
++    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
++  ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
++    SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
++  ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
++
++  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)
++
++  SET(PYTHON_VERSION 3.1)
++
++  IF(PYTHON_VERSION MATCHES 3.1)
++    # we use precompiled libraries for py 3.1 and up by default
++
++    SET(PYTHON ${LIBDIR}/python)
++    SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
++    # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
++    SET(PYTHON_LIB python${PYTHON_VERSION})
++    SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
++    #    SET(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
++  ELSE(PYTHON_VERSION MATCHES 3.1)
++    # otherwise, use custom system framework
++
++    SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
++    SET(PYTHON_VERSION 2.5)
++    SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
++    # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
++    SET(PYTHON_LIB "")
++    SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
++    SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
++  ENDIF(PYTHON_VERSION MATCHES 3.1)
++
++  SET(GETTEXT ${LIBDIR}/gettext)
++  SET(GETTEXT_INC "${GETTEXT}/include")
++  SET(GETTEXT_LIB intl iconv)
++  SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
    
--      IF(WITH_FFTW3)
--              SET(FFTW3 ${LIBDIR}/fftw3)
--              SET(FFTW3_INC ${FFTW3}/include)
--              SET(FFTW3_LIB libfftw)
--              SET(FFTW3_LIBPATH ${FFTW3}/lib)
--      ENDIF(WITH_FFTW3)
--
--      SET(PNG_LIBRARIES png)
--      SET(JPEG_LIBRARY jpeg)
--
--      SET(ZLIB /usr)
--      SET(ZLIB_INC "${ZLIB}/include")
--      SET(ZLIB_LIBRARIES z)
--
--      SET(FREETYPE ${LIBDIR}/freetype)
--      SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
--      SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
--      SET(FREETYPE_LIBRARY freetype)
--
--      SET(OPENEXR ${LIBDIR}/openexr)
--      SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
--      SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
--      SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
--
--      SET(FFMPEG ${LIBDIR}/ffmpeg)
--      SET(FFMPEG_INC ${CMAKE_SOURCE_DIR}/extern/ffmpeg)
--      SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore)
--      SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
--
--      SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
--      SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
--      SET(LIBSAMPLERATE_LIB samplerate)
--      SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
--
--      SET(LLIBS stdc++ SystemStubs)
--
--      SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
--      SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
--
--      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(SDL ${LIBDIR}/sdl)
--      SET(SDL_INCLUDE_DIR ${SDL}/include)
--      SET(SDL_LIBRARY SDL)
--      SET(SDL_LIBPATH ${SDL}/lib)
--
--      SET(PNG "${LIBDIR}/png")
--      SET(PNG_INC "${PNG}/include")
--      SET(PNG_LIBPATH ${PNG}/lib)
--
--      SET(JPEG "${LIBDIR}/jpeg")
--      SET(JPEG_INC "${JPEG}/include")
--      SET(JPEG_LIBPATH ${JPEG}/lib)
--
--      SET(TIFF ${LIBDIR}/tiff)
--      SET(TIFF_INC ${TIFF}/include)
--
--      SET(EXETYPE MACOSX_BUNDLE)
++  IF(WITH_FFTW3)
++    SET(FFTW3 ${LIBDIR}/fftw3)
++    SET(FFTW3_INC ${FFTW3}/include)
++    SET(FFTW3_LIB libfftw)
++    SET(FFTW3_LIBPATH ${FFTW3}/lib)
++  ENDIF(WITH_FFTW3)
++
++  SET(PNG_LIBRARIES png)
++  SET(JPEG_LIBRARY jpeg)
++
++  SET(ZLIB /usr)
++  SET(ZLIB_INC "${ZLIB}/include")
++  SET(ZLIB_LIBRARIES z)
++
++  SET(FREETYPE ${LIBDIR}/freetype)
++  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
++  SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
++  SET(FREETYPE_LIBRARY freetype)
++
++  SET(OPENEXR ${LIBDIR}/openexr)
++  SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
++  SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
++  SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
++
++  SET(FFMPEG ${LIBDIR}/ffmpeg)
++  SET(FFMPEG_INC ${CMAKE_SOURCE_DIR}/extern/ffmpeg)
++  SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore)
++  SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
++
++  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
++  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
++  SET(LIBSAMPLERATE_LIB samplerate)
++  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
++
++  SET(LLIBS stdc++ SystemStubs)
++
++  SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
++  SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
++
++  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(SDL ${LIBDIR}/sdl)
++  SET(SDL_INCLUDE_DIR ${SDL}/include)
++  SET(SDL_LIBRARY SDL)
++  SET(SDL_LIBPATH ${SDL}/lib)
++
++  SET(PNG "${LIBDIR}/png")
++  SET(PNG_INC "${PNG}/include")
++  SET(PNG_LIBPATH ${PNG}/lib)
++
++  SET(JPEG "${LIBDIR}/jpeg")
++  SET(JPEG_INC "${JPEG}/include")
++  SET(JPEG_LIBPATH ${JPEG}/lib)
++
++  SET(TIFF ${LIBDIR}/tiff)
++  SET(TIFF_INC ${TIFF}/include)
++
++  SET(EXETYPE MACOSX_BUNDLE)
  ENDIF(APPLE)
  
  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
--      SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
--      SET(BINRELOC_INC ${BINRELOC}/include)
++  SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
++  SET(BINRELOC_INC ${BINRELOC}/include)
  ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
  
--
--# TODO - buildinfo
--# IF(UNIX)
--#   IF(WITH_BUILDINFO)
--#     EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
--#     EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
--#     EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
--#     SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
--#   ENDIF(WITH_BUILDINFO)
--# ENDIF(UNIX)
--
  #-----------------------------------------------------------------------------
  # Common.
  
@@@ -534,10 -534,10 +496,10 @@@ set(OPENJPEG_LIb extern_libopenjpeg
  # Blender WebPlugin
  
  IF(WITH_WEBPLUGIN) 
--      SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
--      SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
++  SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
++  SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
  
--      SET(WITH_PLAYER ON)
++  SET(WITH_PLAYER ON)
  ENDIF(WITH_WEBPLUGIN)
  
  
@@@ -555,7 -555,7 +517,7 @@@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS
  
  # better not define flags here but this is a debugging option thats off by default.
  IF(WITH_CXX_GUARDEDALLOC)
--      SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
++  SET(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
  ENDIF(WITH_CXX_GUARDEDALLOC)
  
  #-----------------------------------------------------------------------------
@@@ -574,6 -574,6 +536,6 @@@ ADD_SUBDIRECTORY(source/creator
  #-----------------------------------------------------------------------------
  # Blender Player
  IF(WITH_PLAYER)
--      ADD_SUBDIRECTORY(source/blenderplayer)
++  ADD_SUBDIRECTORY(blenderplayer)
  ENDIF(WITH_PLAYER)
  
diff --cc SConstruct
index