[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34575] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 34574.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Mon Jan 31 00:42:13 CET 2011 

Revision: 34575
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34575
Author:   kjym3
Date:     2011-01-30 23:41:58 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 34574.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34574

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
    branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
    branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/doc/build_systems/cmake.txt
    branches/soc-2008-mxcurioni/doc/manpage/blender.1
    branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/Core
    branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/tools/pydna.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
    branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_builtins.py
    branches/soc-2008-mxcurioni/release/scripts/modules/add_object_utils.py
    branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/templates/addon_add_object.py
    branches/soc-2008-mxcurioni/release/scripts/templates/background_job.py
    branches/soc-2008-mxcurioni/release/scripts/templates/builtin_keyingset.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic_basic.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic_module.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_export.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_mesh_add.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_draw.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_simple.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_uv.py
    branches/soc-2008-mxcurioni/release/scripts/templates/panel_simple.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/source/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/avi/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.h
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_util.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/python/generic/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.h
    branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/texture.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2008-mxcurioni/source/gameengine/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_TaskbarWin32.h
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/23.98.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/24.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/25.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/29.97.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/30.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/50.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/59.94.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/60.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/Custom.py
    branches/soc-2008-mxcurioni/source/tests/
    branches/soc-2008-mxcurioni/source/tests/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/tests/bl_test.py
    branches/soc-2008-mxcurioni/source/tests/pep8.py
    branches/soc-2008-mxcurioni/source/tests/rna_array.py
    branches/soc-2008-mxcurioni/source/tests/rna_info_dump.py

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/Makefile
    branches/soc-2008-mxcurioni/build_files/make/
    branches/soc-2008-mxcurioni/doc/build_systems/README.windows-gcc
    branches/soc-2008-mxcurioni/extern/Makefile
    branches/soc-2008-mxcurioni/extern/binreloc/Makefile
    branches/soc-2008-mxcurioni/extern/bullet2/Makefile
    branches/soc-2008-mxcurioni/extern/bullet2/src/Makefile
    branches/soc-2008-mxcurioni/extern/glew/src/Makefile
    branches/soc-2008-mxcurioni/extern/libopenjpeg/Makefile
    branches/soc-2008-mxcurioni/extern/lzma/Makefile
    branches/soc-2008-mxcurioni/extern/lzo/minilzo/Makefile
    branches/soc-2008-mxcurioni/intern/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/FX/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/Python/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/SDL/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/SRC/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/fftw/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/intern/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/jack/Makefile
    branches/soc-2008-mxcurioni/intern/audaspace/sndfile/Makefile
    branches/soc-2008-mxcurioni/intern/boolop/Makefile
    branches/soc-2008-mxcurioni/intern/boolop/intern/Makefile
    branches/soc-2008-mxcurioni/intern/bsp/Makefile
    branches/soc-2008-mxcurioni/intern/bsp/intern/Makefile
    branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/Makefile
    branches/soc-2008-mxcurioni/intern/bsp/test/Makefile
    branches/soc-2008-mxcurioni/intern/container/Makefile
    branches/soc-2008-mxcurioni/intern/container/intern/Makefile
    branches/soc-2008-mxcurioni/intern/decimation/Makefile
    branches/soc-2008-mxcurioni/intern/decimation/intern/Makefile
    branches/soc-2008-mxcurioni/intern/decimation/test/Makefile
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/Makefile
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/Makefile
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/common/Makefile
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/ply/Makefile
    branches/soc-2008-mxcurioni/intern/elbeem/Makefile
    branches/soc-2008-mxcurioni/intern/elbeem/intern/Makefile
    branches/soc-2008-mxcurioni/intern/ghost/Makefile
    branches/soc-2008-mxcurioni/intern/ghost/intern/Makefile
    branches/soc-2008-mxcurioni/intern/ghost/test/Makefile
    branches/soc-2008-mxcurioni/intern/ghost/test/gears/Makefile
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/Makefile
    branches/soc-2008-mxcurioni/intern/guardedalloc/Makefile
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/Makefile
    branches/soc-2008-mxcurioni/intern/guardedalloc/test/Makefile
    branches/soc-2008-mxcurioni/intern/guardedalloc/test/simpletest/Makefile
    branches/soc-2008-mxcurioni/intern/iksolver/Makefile
    branches/soc-2008-mxcurioni/intern/iksolver/intern/Makefile
    branches/soc-2008-mxcurioni/intern/iksolver/test/Makefile
    branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/Makefile
    branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/common/Makefile
    branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/intern/Makefile
    branches/soc-2008-mxcurioni/intern/itasc/Makefile
    branches/soc-2008-mxcurioni/intern/itasc/kdl/Makefile
    branches/soc-2008-mxcurioni/intern/itasc/kdl/utilities/Makefile
    branches/soc-2008-mxcurioni/intern/memutil/Makefile
    branches/soc-2008-mxcurioni/intern/memutil/intern/Makefile
    branches/soc-2008-mxcurioni/intern/moto/Makefile
    branches/soc-2008-mxcurioni/intern/moto/intern/Makefile
    branches/soc-2008-mxcurioni/intern/opennl/Makefile
    branches/soc-2008-mxcurioni/intern/opennl/intern/Makefile
    branches/soc-2008-mxcurioni/intern/opennl/superlu/Makefile
    branches/soc-2008-mxcurioni/intern/smoke/Makefile
    branches/soc-2008-mxcurioni/intern/smoke/intern/Makefile
    branches/soc-2008-mxcurioni/intern/string/Makefile
    branches/soc-2008-mxcurioni/intern/string/intern/Makefile
    branches/soc-2008-mxcurioni/po/Makefile
    branches/soc-2008-mxcurioni/release/Makefile
    branches/soc-2008-mxcurioni/release/getversion.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/23.98.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/24.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/25.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/29.97.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/30.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/50.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/59.94.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/60.py
    branches/soc-2008-mxcurioni/release/scripts/presets/framerate/Custom.py
    branches/soc-2008-mxcurioni/source/Makefile
    branches/soc-2008-mxcurioni/source/blender/Makefile
    branches/soc-2008-mxcurioni/source/blender/avi/Makefile
    branches/soc-2008-mxcurioni/source/blender/avi/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenfont/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenkernel/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenlib/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenloader/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenpluginapi/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenpluginapi/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/collada/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/animation/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/armature/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/curve/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/interface/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/object/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/physics/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/render/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/screen/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/sound/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_api/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_script/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_sound/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/transform/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/util/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/Makefile
    branches/soc-2008-mxcurioni/source/blender/gpu/Makefile
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/ikplugin/Makefile
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/imbuf/Makefile
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/Makefile
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Makefile
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/Makefile
    branches/soc-2008-mxcurioni/source/blender/makesdna/Makefile
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/makesrna/Makefile
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/modifiers/Makefile
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/nodes/Makefile
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/Makefile
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/Makefile
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/Makefile
    branches/soc-2008-mxcurioni/source/blender/python/Makefile
    branches/soc-2008-mxcurioni/source/blender/python/generic/Makefile
    branches/soc-2008-mxcurioni/source/blender/python/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/quicktime/Makefile
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/Makefile
    branches/soc-2008-mxcurioni/source/blender/readblenfile/Makefile
    branches/soc-2008-mxcurioni/source/blender/readblenfile/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/readblenfile/stub/Makefile
    branches/soc-2008-mxcurioni/source/blender/readblenfile/test/Makefile
    branches/soc-2008-mxcurioni/source/blender/render/Makefile
    branches/soc-2008-mxcurioni/source/blender/render/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/Makefile
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/Makefile
    branches/soc-2008-mxcurioni/source/blender/windowmanager/Makefile
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/Makefile
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/Makefile
    branches/soc-2008-mxcurioni/source/creator/Makefile
    branches/soc-2008-mxcurioni/source/darwin/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Converter/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Network/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Network/TerraplayNetwork/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/Makefile
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/Makefile
    branches/soc-2008-mxcurioni/source/icons/Makefile
    branches/soc-2008-mxcurioni/source/kernel/Makefile
    branches/soc-2008-mxcurioni/source/kernel/gen_messaging/Makefile
    branches/soc-2008-mxcurioni/source/kernel/gen_messaging/intern/Makefile
    branches/soc-2008-mxcurioni/source/kernel/gen_system/Makefile
    branches/soc-2008-mxcurioni/source/test/
    branches/soc-2008-mxcurioni/source/tests/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/tests/bl_test.py
    branches/soc-2008-mxcurioni/source/tests/pep8.py
    branches/soc-2008-mxcurioni/source/tests/rna_array.py
    branches/soc-2008-mxcurioni/source/tests/rna_info_dump.py
    branches/soc-2008-mxcurioni/source/tools/guess/

Property Changed:
----------------
    branches/soc-2008-mxcurioni/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34011-34459
   + /trunk/blender:34011-34574

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2011-01-30 22:15:50 UTC (rev 34574)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2011-01-30 23:41:58 UTC (rev 34575)
@@ -166,9 +166,9 @@
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
-#   cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
+#   cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
 # On Macs: 
-#   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
+#   cmake -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
 #
 # When changing any of this remember to update the notes in doc/build_systems/cmake.txt
 
@@ -227,11 +227,11 @@
 		# find_package(PythonLibs)
 		set(PYTHON /usr)
 		set(PYTHON_VERSION 3.1)
-		set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-		mark_as_advanced(PYTHON_INC)
+		set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		mark_as_advanced(PYTHON_INCLUDE_DIRS)
 		# set(PYTHON_BINARY python) # not used yet
-		set(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-		mark_as_advanced(PYTHON_LIB)
+		set(PYTHON_LIBRARY python${PYTHON_VERSION} CACHE STRING "")
+		mark_as_advanced(PYTHON_LIBRARY)
 		set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
 		mark_as_advanced(PYTHON_LIBPATH)
 		# find_package(PythonInterp) # not used yet
@@ -246,6 +246,7 @@
 		mark_as_advanced(SDLMAIN_LIBRARY)
 		mark_as_advanced(SDL_INCLUDE_DIR)
 		mark_as_advanced(SDL_LIBRARY)
+		mark_as_advanced(SDL_LIBRARY_TEMP)
 		# unset(SDLMAIN_LIBRARY CACHE)
 		if(NOT SDL_FOUND)
 			set(WITH_SDL OFF)
@@ -411,12 +412,12 @@
 	endif()
 
 	set(PNG "${LIBDIR}/png")
-	set(PNG_INC "${PNG}/include")
-	set(PNG_LIBPATH ${PNG}/lib)
+	set(PNG_INCLUDE_DIR "${PNG}/include")
+	set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 
 	set(JPEG "${LIBDIR}/jpeg")
-	set(JPEG_INC "${JPEG}/include")
-	set(JPEG_LIBPATH ${JPEG}/lib)
+	set(JPEG_INCLUDE_DIR "${JPEG}/include")
+	set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
 
 	set(WINTAB_INC ${LIBDIR}/wintab/include) 
 
@@ -495,10 +496,10 @@
 		else()
 			set(PNG_LIBRARIES libpng_st)
 		endif()
-		set(JPEG_LIBRARY libjpeg)
+		set(JPEG_LIBRARIES libjpeg)
 
 		set(ZLIB ${LIBDIR}/zlib)
-		set(ZLIB_INC ${ZLIB}/include)
+		set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
 		set(ZLIB_LIBPATH ${ZLIB}/lib)
 		if(CMAKE_CL_64)
 			set(ZLIB_LIBRARIES libz)
@@ -527,7 +528,7 @@
 			set(OPENCOLLADA ${LIBDIR}/opencollada)
 			set(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-			set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
+			set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
 			set(PCRE_LIB pcre)
 		endif()
 		
@@ -576,9 +577,9 @@
 		if(WITH_PYTHON)
 			set(PYTHON ${LIBDIR}/python)
 			set(PYTHON_VERSION 3.1)
-			set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+			set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
 			# set(PYTHON_BINARY python) # not used yet
-			set(PYTHON_LIB python31)
+			set(PYTHON_LIBRARY python31)
 			set(PYTHON_LIBPATH ${PYTHON}/lib)
 		endif()
 
@@ -613,11 +614,11 @@
 			set(GETTEXT_LIB intl)
 		endif()
 
-		set(JPEG_LIBRARY libjpeg)
+		set(JPEG_LIBRARIES libjpeg)
 		set(PNG_LIBRARIES png)
 
 		set(ZLIB ${LIBDIR}/zlib)
-		set(ZLIB_INC ${ZLIB}/include)
+		set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
 		set(ZLIB_LIBPATH ${ZLIB}/lib)
 		set(ZLIB_LIBRARIES z)
 
@@ -683,9 +684,9 @@
 		if(WITH_PYTHON)
 			set(PYTHON ${LIBDIR}/python)
 			set(PYTHON_VERSION 3.1)
-			set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+			set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
 			# set(PYTHON_BINARY python) # not used yet
-			set(PYTHON_LIB python31mw)
+			set(PYTHON_LIBRARY python31mw)
 			set(PYTHON_LIBPATH ${PYTHON}/lib)
 		endif()
 
@@ -737,9 +738,9 @@
 		# we use precompiled libraries for py 3.1 and up by default
 
 		set(PYTHON ${LIBDIR}/python)
-		set(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+		set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
 		# set(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
-		set(PYTHON_LIB python${PYTHON_VERSION})
+		set(PYTHON_LIBRARY python${PYTHON_VERSION})
 		set(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
 		# set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
 	else()
@@ -747,9 +748,9 @@
 
 		set(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
 		set(PYTHON_VERSION 3.1)
-		set(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
+		set(PYTHON_INCLUDE_DIRS "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
 		# set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
-		set(PYTHON_LIB "")
+		set(PYTHON_LIBRARY "")
 		set(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config)
 		set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
 	endif()
@@ -769,10 +770,10 @@
 	endif()
 
 	set(PNG_LIBRARIES png)
-	set(JPEG_LIBRARY jpeg)
+	set(JPEG_LIBRARIES jpeg)
 
 	set(ZLIB /usr)
-	set(ZLIB_INC "${ZLIB}/include")
+	set(ZLIB_INCLUDE_DIRS "${ZLIB}/include")
 	set(ZLIB_LIBRARIES z bz2)
 
 	set(FREETYPE ${LIBDIR}/freetype)
@@ -852,11 +853,11 @@
 	endif()
 
 	set(PNG "${LIBDIR}/png")
-	set(PNG_INC "${PNG}/include")
+	set(PNG_INCLUDE_DIR "${PNG}/include")
 	set(PNG_LIBPATH ${PNG}/lib)
 
 	set(JPEG "${LIBDIR}/jpeg")
-	set(JPEG_INC "${JPEG}/include")
+	set(JPEG_INCLUDE_DIR "${JPEG}/include")
 	set(JPEG_LIBPATH ${JPEG}/lib)
 
 	if(WITH_IMAGE_TIFF)

Deleted: branches/soc-2008-mxcurioni/Makefile
===================================================================
--- branches/soc-2008-mxcurioni/Makefile	2011-01-30 22:15:50 UTC (rev 34574)
+++ branches/soc-2008-mxcurioni/Makefile	2011-01-30 23:41:58 UTC (rev 34575)
@@ -1,60 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-# $Id$
-#
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2002 by Wouter van Heyst
-# All rights reserved.
-#
-# The Original Code is: revision 1.1
-#
-# Contributor(s): Hans Lambermont, GSR
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-# Toplevel Makefile for blender. Bounces make to subdirectories.
-# Available targets: 'all' 'debug' 'release'
-
-# If the user wants to override some of the build
-# vars they can put it in the file user-def.mk which
-# will get included if it exists (please do not commit
-# user-def.mk to the revision control server).
-sinclude user-def.mk
-
-# To build without openAL, set it as an environment variable,
-# or put it uncommented in user-def.mk:
-# export NAN_NO_OPENAL=true
-
-export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
-
-SOURCEDIR = 
-ifeq ($(FREE_WINDOWS),true)
-    DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po
-else
-    DIRS ?= extern intern source po
-endif
-
-include build_files/make/nan_subdirs.mk
-
-.PHONY: release
-release:
-	@echo "====> $(MAKE) $@ in $(SOURCEDIR)/$@" ;\
-	    $(MAKE) -C $@ $@ || exit 1;
-
-

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2011-01-30 22:15:50 UTC (rev 34574)
+++ branches/soc-2008-mxcurioni/SConstruct	2011-01-30 23:41:58 UTC (rev 34575)
@@ -142,7 +142,6 @@
     print "Could not create a build environment"
     Exit()
 
-
 cc = B.arguments.get('CC', None)
 cxx = B.arguments.get('CXX', None)
 if cc:

Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py	2011-01-30 22:15:50 UTC (rev 34574)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py	2011-01-30 23:41:58 UTC (rev 34575)
@@ -128,6 +128,10 @@
                             raise Exception("strict formatting not kept '*)' %s:%d" % (f, i))
                         break
 
+                    # replace dirs
+                    l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
+                    
+
                     if not l:
                         pass
                     elif l.startswith("$"):
@@ -202,11 +206,14 @@
 import traceback
 for files in (global_c, global_h):
     for f in sorted(files):
-        i = 1
-        try:
-            for l in open(f, "r", encoding="utf8"):
-                i += 1
-        except:
-            print("Non utf8: %s:%d" % (f, i))
-            if i > 1:
-                traceback.print_exc()
+        if os.path.exists(f):

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list