[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36093] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 36092.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Mon Apr 11 02:09:57 CEST 2011
Revision: 36093
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36093
Author: kjym3
Date: 2011-04-11 00:09:56 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 36092.
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36092
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-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/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/manpage/blender.1
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.props.2.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.py
branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.py
branches/soc-2008-mxcurioni/doc/python_api/rst/bge.logic.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/SConscript
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/console_python.py
branches/soc-2008-mxcurioni/release/scripts/modules/keyingsets_utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/__init__.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_console.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/scripts/startup/keyingsets_builtins.py
branches/soc-2008-mxcurioni/release/scripts/templates/background_job.py
branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_dir.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sound.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.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/sound.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
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/editors/animation/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_gl.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt
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_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.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_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.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_Quaternion.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_Vector.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/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/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.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/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2008-mxcurioni/source/icons/winblender.rc
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
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/cmake/Modules/
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake
branches/soc-2008-mxcurioni/doc/python_api/rst/change_log.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_changelog_gen.py
branches/soc-2008-mxcurioni/extern/eltopo/
branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/eltopo/SConscript
branches/soc-2008-mxcurioni/extern/eltopo/common/
branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3_utils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.h
branches/soc-2008-mxcurioni/extern/eltopo/common/blas_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.h
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.h
branches/soc-2008-mxcurioni/extern/eltopo/common/cubic_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fe_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.h
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h
branches/soc-2008-mxcurioni/extern/eltopo/common/grid3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/hashtable.h
branches/soc-2008-mxcurioni/extern/eltopo/common/lapack_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.h
branches/soc-2008-mxcurioni/extern/eltopo/common/mat.h
branches/soc-2008-mxcurioni/extern/eltopo/common/matlapack.h
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/Edge.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/TriangleIndex.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/linear_operator.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/openglutils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sos_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/cgsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/crsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparseilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsematrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsemilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/tunicate.h
branches/soc-2008-mxcurioni/extern/eltopo/common/util.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vec.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vector_math.h
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.example_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.inc
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.local_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/options.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/readme.txt
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.h
branches/soc-2008-mxcurioni/extern/eltopo/readme.txt
Removed Paths:
-------------
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake
branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/eltopo/SConscript
branches/soc-2008-mxcurioni/extern/eltopo/common/
branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/array3_utils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.h
branches/soc-2008-mxcurioni/extern/eltopo/common/blas_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/clamped_spline.h
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.h
branches/soc-2008-mxcurioni/extern/eltopo/common/cubic_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fe_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.h
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h
branches/soc-2008-mxcurioni/extern/eltopo/common/grid3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/hashtable.h
branches/soc-2008-mxcurioni/extern/eltopo/common/lapack_wrapper.h
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/levelset.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset2.h
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.h
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/marching_triangles.h
branches/soc-2008-mxcurioni/extern/eltopo/common/mat.h
branches/soc-2008-mxcurioni/extern/eltopo/common/matlapack.h
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/Edge.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/ObjLoader.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/TriangleIndex.hpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/meshes/meshloader.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/linear_operator.h
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/openglutils.h
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sos_ccd_wrapper.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/cgsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/crsolver.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/incomplete_qr.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparseilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsematrix.h
branches/soc-2008-mxcurioni/extern/eltopo/common/sparse/sparsemilu.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.h
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_intersection.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/tunicate.h
branches/soc-2008-mxcurioni/extern/eltopo/common/util.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vec.h
branches/soc-2008-mxcurioni/extern/eltopo/common/vector_math.h
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.cpp
branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.example_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.inc
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.local_defs
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/options.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/readme.txt
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.h
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp
branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.h
branches/soc-2008-mxcurioni/extern/eltopo/readme.txt
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-35972
+ /trunk/blender:34011-36092
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-04-11 00:09:56 UTC (rev 36093)
@@ -44,11 +44,41 @@
cmake_minimum_required(VERSION 2.8)
+# this starts out unset
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules/")
+
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
+# ignore system set flag, use our own
+# must be before project(...)
+# if the user wants to add their own its ok after first run.
+if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
+ set(_reset_standard_libraries OFF)
+else()
+ set(_reset_standard_libraries ON)
+endif()
+
+
project(Blender)
+
+if (_reset_standard_libraries)
+ message("Reset Libs")
+ # Must come after project(...)
+ #
+ # MINGW workaround for -ladvapi32 being included which surprisingly causes
+ # string formatting of floats, eg: printf("%.*f", 3, value). to crash blender
+ # with a meaningless stack trace. by overriding this flag we ensure we only
+ # have libs we define and that cmake & scons builds match.
+ set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+ mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
+ mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
+endif()
+unset(_reset_standard_libraries)
+
+
enable_testing()
#-----------------------------------------------------------------------------
@@ -69,6 +99,7 @@
# Blender internal features
option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
+mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON)
@@ -86,12 +117,18 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON)
+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+else()
+ # not an option for other OS's
+ set(WITH_BUILTIN_GLEW ON)
endif()
# Modifiers
option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
+mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
# Image format support
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
@@ -506,7 +543,7 @@
if(MSVC)
if(CMAKE_CL_64)
- set(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+ set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid )
else()
set(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
endif()
@@ -1021,6 +1058,23 @@
endif()
#-----------------------------------------------------------------------------
+# Configure GLEW
+
+if(WITH_BUILTIN_GLEW)
+ # set(GLEW_LIBRARY "") # unused
+ set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
+else()
+ find_package(GLEW)
+
+ if(NOT GLEW_FOUND)
+ message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW")
+ endif()
+
+ mark_as_advanced(GLEW_LIBRARY)
+ mark_as_advanced(GLEW_INCLUDE_PATH)
+endif()
+
+#-----------------------------------------------------------------------------
# Configure Python.
if(WITH_PYTHON_MODULE)
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2011-04-11 00:09:56 UTC (rev 36093)
@@ -98,6 +98,16 @@
test:
cd $(BUILD_DIR) ; ctest . --output-on-failure
+# run pep8 check check on scripts we distribute.
+test_pep8:
+ python source/tests/pep8.py > test_pep8.log 2>&1
+ @echo "written: test_pep8.log"
+
+# run some checks on our cmakefiles.
+test_cmake:
+ python build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+ @echo "written: test_cmake_consistency.log"
+
clean:
cd $(BUILD_DIR) ; make clean
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-04-11 00:09:56 UTC (rev 36093)
@@ -64,8 +64,9 @@
WITH_BF_STATICLIBSAMPLERATE = True
+WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
WITH_BF_SDL = True
WITH_BF_OGG = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py 2011-04-11 00:09:56 UTC (rev 36093)
@@ -42,10 +42,10 @@
WITH_BF_STATICLIBSAMPLERATE = True
-WITH_BF_ZLIB = False
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-WITH_BF_STATICZLIB = False
WITH_BF_SDL = True
WITH_BF_OGG = False
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-04-11 00:09:56 UTC (rev 36093)
@@ -42,8 +42,9 @@
WITH_BF_STATICLIBSAMPLERATE = True
-WITH_BF_ZLIB = False
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
WITH_BF_STATICZLIB = False
WITH_BF_SDL = True
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-04-11 00:09:56 UTC (rev 36093)
@@ -64,8 +64,9 @@
WITH_BF_STATICLIBSAMPLERATE = True
+WITH_BF_ZLIB = True
WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC= '${BF_ZLIB}/lib/libz.a'
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
WITH_BF_SDL = True
WITH_BF_OGG = True
Modified: branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake 2011-04-11 00:09:56 UTC (rev 36093)
@@ -4,7 +4,7 @@
# PYTHON_INCLUDE_DIRS
# PYTHON_LIBRARY
# PYTHON_LIBPATH
-# PYTHON_LINKFLAGS
+# PYTHON_LINKFLAGSPYTHON
#=============================================================================
Deleted: branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindGLEW.cmake 2011-04-10 22:40:37 UTC (rev 36092)
+++ branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake 2011-04-11 00:09:56 UTC (rev 36093)
@@ -1,59 +0,0 @@
-#
-# Try to find GLEW library and include path.
-# Once done this will define
-#
-# GLEW_FOUND
-# GLEW_INCLUDE_PATH
-# GLEW_LIBRARY
-#
-
-IF (WIN32)
- FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
- $ENV{PROGRAMFILES}/GLEW/include
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
- DOC "The directory where GL/glew.h resides")
- IF (NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
- FIND_LIBRARY( GLEW_LIBRARY
- NAMES glew64 glew64s
- PATHS
- $ENV{PROGRAMFILES}/GLEW/lib
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
- DOC "The GLEW library (64-bit)"
- )
- ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
- FIND_LIBRARY( GLEW_LIBRARY
- NAMES glew GLEW glew32 glew32s
- PATHS
- $ENV{PROGRAMFILES}/GLEW/lib
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
- DOC "The GLEW library"
- )
- ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-ELSE (WIN32)
- FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
- /usr/include
- /usr/local/include
- /sw/include
- /opt/local/include
- DOC "The directory where GL/glew.h resides")
- FIND_LIBRARY( GLEW_LIBRARY
- NAMES GLEW glew
- PATHS
- /usr/lib64
- /usr/lib
- /usr/local/lib64
- /usr/local/lib
- /sw/lib
- /opt/local/lib
- DOC "The GLEW library")
-ENDIF (WIN32)
-
-IF (GLEW_INCLUDE_PATH)
- SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
-ELSE (GLEW_INCLUDE_PATH)
- SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
-ENDIF (GLEW_INCLUDE_PATH)
-
-MARK_AS_ADVANCED( GLEW_FOUND )
Copied: branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake (from rev 36092, trunk/blender/build_files/cmake/Modules/FindGLEW.cmake)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake (rev 0)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list