[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31632] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 31630.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Aug 28 16:30:53 CEST 2010
Revision: 31632
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31632
Author: kjym3
Date: 2010-08-28 16:30:52 +0200 (Sat, 28 Aug 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 31630.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31630
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/linux2-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/extern/libopenjpeg/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzma/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzma/SConscript
branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzo/SConscript
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/SConscript
branches/soc-2008-mxcurioni/intern/boolop/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/boolop/SConscript
branches/soc-2008-mxcurioni/intern/bsp/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/bsp/SConscript
branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/container/SConscript
branches/soc-2008-mxcurioni/intern/decimation/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/decimation/SConscript
branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/elbeem/SConscript
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/SConscript
branches/soc-2008-mxcurioni/intern/guardedalloc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/guardedalloc/SConscript
branches/soc-2008-mxcurioni/intern/iksolver/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/iksolver/SConscript
branches/soc-2008-mxcurioni/intern/itasc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/itasc/SConscript
branches/soc-2008-mxcurioni/intern/memutil/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/memutil/SConscript
branches/soc-2008-mxcurioni/intern/moto/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/moto/SConscript
branches/soc-2008-mxcurioni/intern/opennl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/opennl/SConscript
branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/smoke/SConscript
branches/soc-2008-mxcurioni/intern/string/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/string/SConscript
branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/neck_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/palm_curl.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/tongue.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/animsys_update.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/blender.py
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/maya.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_uv.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_animviz.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.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_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_filebrowser.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_nla.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_outliner.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_constraint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mball.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/property.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_color.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
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/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
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_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
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/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.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_main.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.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_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2008-mxcurioni/source/blender/python/SConscript
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/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/bge.logic.rst
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-08-28 13:52:49 UTC (rev 31631)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-08-28 14:30:52 UTC (rev 31632)
@@ -294,9 +294,9 @@
SET(EXPAT_LIB expat)
ENDIF (WITH_OPENCOLLADA)
+ FIND_PACKAGE(X11 REQUIRED)
- # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
- SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+ SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# BSD's dont use libdl.so
@@ -873,7 +873,7 @@
IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG})
- set(OPENJPEG_LIb extern_libopenjpeg)
+ set(OPENJPEG_LIb extern_openjpeg)
ENDIF(WITH_IMAGE_OPENJPEG)
#-----------------------------------------------------------------------------
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2010-08-28 13:52:49 UTC (rev 31631)
+++ branches/soc-2008-mxcurioni/SConstruct 2010-08-28 14:30:52 UTC (rev 31632)
@@ -406,12 +406,12 @@
thesyslibs = B.setup_syslibs(env)
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
- env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+ env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
playerlist += B.create_blender_liblist(env, 'intern')
playerlist += B.create_blender_liblist(env, 'extern')
- env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+ env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
##### Now define some targets
@@ -427,6 +427,8 @@
for dp, dn, df in os.walk(bundle):
if '.svn' in dn:
dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
source=[dp+os.sep+f for f in df]
blenderinstall.append(env.Install(dir=dir,source=source))
@@ -445,6 +447,8 @@
for dp, dn, df in os.walk('bin/.blender'):
if '.svn' in dn:
dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
for f in df:
if not env['WITH_BF_INTERNATIONAL']:
@@ -481,6 +485,8 @@
for dp, dn, df in os.walk(scriptpath):
if '.svn' in dn:
dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
@@ -496,6 +502,8 @@
for tp, tn, tf in os.walk('release/freedesktop/icons'):
if '.svn' in tn:
tn.remove('.svn')
+ if '_svn' in tn:
+ tn.remove('_svn')
for f in tf:
iconlist.append(os.path.join(tp, f))
icontargetlist.append( os.path.join(*([env['BF_INSTALLDIR']] + tp.split(os.sep)[2:] + [f])) )
@@ -522,6 +530,8 @@
for tp, tn, tf in os.walk('release/plugins'):
if '.svn' in tn:
tn.remove('.svn')
+ if '_svn' in tn:
+ tn.remove('_svn')
df = tp[8:] # remove 'release/'
for f in tf:
pluglist.append(os.path.join(tp, f))
@@ -554,6 +564,8 @@
for tp, tn, tf in os.walk('release/text'):
if '.svn' in tn:
tn.remove('.svn')
+ if '_svn' in tn:
+ tn.remove('_svn')
for f in tf:
textlist.append(tp+os.sep+f)
Copied: branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py (from rev 31630, trunk/blender/build_files/cmake/example_scripts/make_quicky.py)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/make_quicky.py 2010-08-28 14:30:52 UTC (rev 31632)
@@ -0,0 +1,119 @@
+#! /usr/bin/env python
+
+# ##### 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+def print_help(targets):
+ print("CMake quicky wrapper, no valid targets given.")
+ print(" * targets can contain a subset of the full target name.")
+ print(" * arguments with a '-' prefix are passed onto make.")
+ print(" * this must run from the cmake build dir")
+ print(" * alias this with a short command for speedy access, in bash:")
+ print(" alias mk='../blender/build_files/cmake/example_scripts/make_quicky.py'")
+ print("")
+ print(" eg: make_quicky.py -j3 extern python")
+ print(" ...will execute")
+ print(" make -j3 extern_binreloc extern_glew bf_python bf_python_ext blender/fast")
+ print("")
+ print("Target List:")
+ for t in targets:
+ print(" %s" % t)
+ print("...exiting")
+
+
+def main():
+ targets = set()
+
+ # collect targets
+ file = open("Makefile", "r")
+ for line in file:
+ line = line.rstrip()
+ if not line or line[0] in ". \t@$#":
+ continue
+
+ line = line.split("#", 1)[0]
+ if ":" not in line:
+ continue
+
+ line = line.split(":", 1)[0]
+
+ if "/" in line: # cmake terget options, dont need these
+ continue
+
+ targets.add(line)
+ file.close()
+
+
+ # remove cmake targets
+ bad = set([
+ "help",
+ "clean",
+ "all",
+ "preinstall",
+ "install",
+ "default_target",
+ "edit_cache",
+ "cmake_force",
+ "rebuild_cache",
+ "depend",
+ "cmake_check_build_system",
+ ])
+
+ targets -= set(bad)
+
+
+ # parse args
+ targets = list(targets)
+ targets.sort()
+
+ import sys
+ if len(sys.argv) == 1:
+ print_help(targets)
+ return
+
+ targets_new = []
+ args = []
+ for arg in sys.argv[1:]:
+ if arg[0] in "/-":
+ args.append(arg)
+ else:
+ found = False
+ for t in targets:
+ if arg in t and t not in targets_new:
+ targets_new.append(t)
+ found = True
+
+ if not found:
+ print("Error '%s' not found in...")
+ for t in targets:
+ print(" %s" % t)
+ print("...aborting.")
+ return
+
+ # execute
+ cmd = "make %s %s blender/fast" % (" ".join(args), " ".join(targets_new))
+ print("cmake building with targets: %s" % " ".join(targets_new))
+ print("executing: %s" % cmd)
+
+ import os
+ os.system(cmd)
+
+if __name__ == "__main__":
+ main()
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py 2010-08-28 13:52:49 UTC (rev 31631)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py 2010-08-28 14:30:52 UTC (rev 31632)
@@ -57,7 +57,6 @@
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
WITH_BF_DDS = True
WITH_BF_JPEG = True
@@ -87,7 +86,7 @@
BF_GETTEXT_LIB = 'gettextlib'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_GAMEENGINE = True
+WITH_BF_GAMEENGINE = False
WITH_BF_PLAYER = True
WITH_BF_BULLET = True
@@ -100,7 +99,8 @@
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
-WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+### XXX Find what this actually wants; it doesn't want libquicktime.
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -195,7 +195,7 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py 2010-08-28 13:52:49 UTC (rev 31631)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py 2010-08-28 14:30:52 UTC (rev 31632)
@@ -57,7 +57,6 @@
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
WITH_BF_DDS = True
WITH_BF_JPEG = True
@@ -87,7 +86,7 @@
BF_GETTEXT_LIB = 'gettextlib'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_GAMEENGINE = True
+WITH_BF_GAMEENGINE = False
WITH_BF_PLAYER = True
WITH_BF_BULLET = True
@@ -100,7 +99,8 @@
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
-WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+### XXX Find what this actually wants; it doesn't want libquicktime.
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -195,7 +195,7 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
##LOPTS = --dynamic
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list