[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33306] branches/particles-2010: svn merge -r32914:33305 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Thu Nov 25 14:04:56 CET 2010
Revision: 33306
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33306
Author: lukastoenne
Date: 2010-11-25 14:04:53 +0100 (Thu, 25 Nov 2010)
Log Message:
-----------
svn merge -r32914:33305 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/doc/manpage/blender.1
branches/particles-2010/doc/manpage/blender.1.py
branches/particles-2010/intern/audaspace/CMakeLists.txt
branches/particles-2010/intern/audaspace/SConscript
branches/particles-2010/intern/audaspace/intern/AUD_DefaultMixer.cpp
branches/particles-2010/intern/ghost/CMakeLists.txt
branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.h
branches/particles-2010/intern/guardedalloc/CMakeLists.txt
branches/particles-2010/intern/guardedalloc/intern/mmap_win.c
branches/particles-2010/intern/smoke/intern/WAVELET_NOISE.h
branches/particles-2010/intern/smoke/intern/WTURBULENCE.cpp
branches/particles-2010/release/scripts/io/netrender/__init__.py
branches/particles-2010/release/scripts/io/netrender/slave.py
branches/particles-2010/release/scripts/io/netrender/ui.py
branches/particles-2010/release/scripts/io/netrender/utils.py
branches/particles-2010/release/scripts/modules/bpy/__init__.py
branches/particles-2010/release/scripts/modules/bpy/ops.py
branches/particles-2010/release/scripts/modules/bpy/utils.py
branches/particles-2010/release/scripts/modules/bpy_types.py
branches/particles-2010/release/scripts/modules/extensions_framework/__init__.py
branches/particles-2010/release/scripts/modules/extensions_framework/engine.py
branches/particles-2010/release/scripts/modules/extensions_framework/outputs/xml_output.py
branches/particles-2010/release/scripts/modules/extensions_framework/plugin.py
branches/particles-2010/release/scripts/modules/extensions_framework/ui.py
branches/particles-2010/release/scripts/modules/extensions_framework/util.py
branches/particles-2010/release/scripts/modules/extensions_framework/validate.py
branches/particles-2010/release/scripts/op/console_python.py
branches/particles-2010/release/scripts/op/io_anim_bvh/__init__.py
branches/particles-2010/release/scripts/op/io_mesh_ply/__init__.py
branches/particles-2010/release/scripts/op/io_scene_3ds/__init__.py
branches/particles-2010/release/scripts/op/io_scene_3ds/export_3ds.py
branches/particles-2010/release/scripts/op/io_scene_3ds/import_3ds.py
branches/particles-2010/release/scripts/op/io_scene_fbx/__init__.py
branches/particles-2010/release/scripts/op/io_scene_fbx/export_fbx.py
branches/particles-2010/release/scripts/op/io_scene_obj/__init__.py
branches/particles-2010/release/scripts/op/io_scene_obj/export_obj.py
branches/particles-2010/release/scripts/op/io_scene_x3d/__init__.py
branches/particles-2010/release/scripts/op/io_shape_mdd/__init__.py
branches/particles-2010/release/scripts/op/nla.py
branches/particles-2010/release/scripts/op/object_align.py
branches/particles-2010/release/scripts/op/uv.py
branches/particles-2010/release/scripts/op/uvcalc_smart_project.py
branches/particles-2010/release/scripts/op/wm.py
branches/particles-2010/release/scripts/templates/operator_uv.py
branches/particles-2010/release/scripts/ui/properties_data_curve.py
branches/particles-2010/release/scripts/ui/properties_data_modifier.py
branches/particles-2010/release/scripts/ui/properties_material.py
branches/particles-2010/release/scripts/ui/properties_object_constraint.py
branches/particles-2010/release/scripts/ui/properties_physics_fluid.py
branches/particles-2010/release/scripts/ui/properties_physics_smoke.py
branches/particles-2010/release/scripts/ui/properties_scene.py
branches/particles-2010/release/scripts/ui/properties_world.py
branches/particles-2010/release/scripts/ui/space_console.py
branches/particles-2010/release/scripts/ui/space_dopesheet.py
branches/particles-2010/release/scripts/ui/space_graph.py
branches/particles-2010/release/scripts/ui/space_info.py
branches/particles-2010/release/scripts/ui/space_nla.py
branches/particles-2010/release/scripts/ui/space_sequencer.py
branches/particles-2010/release/scripts/ui/space_userpref.py
branches/particles-2010/release/scripts/ui/space_view3d.py
branches/particles-2010/release/scripts/ui/space_view3d_toolbar.py
branches/particles-2010/release/windows/installer/00.sconsblender.nsi
branches/particles-2010/source/Makefile
branches/particles-2010/source/blender/avi/AVI_avi.h
branches/particles-2010/source/blender/avi/intern/avi.c
branches/particles-2010/source/blender/blenfont/BLF_api.h
branches/particles-2010/source/blender/blenfont/CMakeLists.txt
branches/particles-2010/source/blender/blenfont/intern/blf.c
branches/particles-2010/source/blender/blenfont/intern/blf_dir.c
branches/particles-2010/source/blender/blenfont/intern/blf_font.c
branches/particles-2010/source/blender/blenfont/intern/blf_internal.h
branches/particles-2010/source/blender/blenkernel/BKE_animsys.h
branches/particles-2010/source/blender/blenkernel/BKE_armature.h
branches/particles-2010/source/blender/blenkernel/BKE_blender.h
branches/particles-2010/source/blender/blenkernel/BKE_bvhutils.h
branches/particles-2010/source/blender/blenkernel/BKE_context.h
branches/particles-2010/source/blender/blenkernel/BKE_curve.h
branches/particles-2010/source/blender/blenkernel/BKE_customdata.h
branches/particles-2010/source/blender/blenkernel/BKE_exotic.h
branches/particles-2010/source/blender/blenkernel/BKE_fcurve.h
branches/particles-2010/source/blender/blenkernel/BKE_font.h
branches/particles-2010/source/blender/blenkernel/BKE_group.h
branches/particles-2010/source/blender/blenkernel/BKE_idprop.h
branches/particles-2010/source/blender/blenkernel/BKE_image.h
branches/particles-2010/source/blender/blenkernel/BKE_key.h
branches/particles-2010/source/blender/blenkernel/BKE_lattice.h
branches/particles-2010/source/blender/blenkernel/BKE_library.h
branches/particles-2010/source/blender/blenkernel/BKE_material.h
branches/particles-2010/source/blender/blenkernel/BKE_mball.h
branches/particles-2010/source/blender/blenkernel/BKE_mesh.h
branches/particles-2010/source/blender/blenkernel/BKE_multires.h
branches/particles-2010/source/blender/blenkernel/BKE_object.h
branches/particles-2010/source/blender/blenkernel/BKE_packedFile.h
branches/particles-2010/source/blender/blenkernel/BKE_particle.h
branches/particles-2010/source/blender/blenkernel/BKE_particleset.h
branches/particles-2010/source/blender/blenkernel/BKE_scene.h
branches/particles-2010/source/blender/blenkernel/BKE_sequencer.h
branches/particles-2010/source/blender/blenkernel/BKE_sound.h
branches/particles-2010/source/blender/blenkernel/BKE_text.h
branches/particles-2010/source/blender/blenkernel/BKE_unit.h
branches/particles-2010/source/blender/blenkernel/BKE_world.h
branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
branches/particles-2010/source/blender/blenkernel/intern/anim.c
branches/particles-2010/source/blender/blenkernel/intern/anim_sys.c
branches/particles-2010/source/blender/blenkernel/intern/armature.c
branches/particles-2010/source/blender/blenkernel/intern/blender.c
branches/particles-2010/source/blender/blenkernel/intern/bvhutils.c
branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c
branches/particles-2010/source/blender/blenkernel/intern/constraint.c
branches/particles-2010/source/blender/blenkernel/intern/context.c
branches/particles-2010/source/blender/blenkernel/intern/curve.c
branches/particles-2010/source/blender/blenkernel/intern/customdata.c
branches/particles-2010/source/blender/blenkernel/intern/displist.c
branches/particles-2010/source/blender/blenkernel/intern/exotic.c
branches/particles-2010/source/blender/blenkernel/intern/fcurve.c
branches/particles-2010/source/blender/blenkernel/intern/font.c
branches/particles-2010/source/blender/blenkernel/intern/group.c
branches/particles-2010/source/blender/blenkernel/intern/idprop.c
branches/particles-2010/source/blender/blenkernel/intern/image.c
branches/particles-2010/source/blender/blenkernel/intern/ipo.c
branches/particles-2010/source/blender/blenkernel/intern/key.c
branches/particles-2010/source/blender/blenkernel/intern/lattice.c
branches/particles-2010/source/blender/blenkernel/intern/library.c
branches/particles-2010/source/blender/blenkernel/intern/material.c
branches/particles-2010/source/blender/blenkernel/intern/mball.c
branches/particles-2010/source/blender/blenkernel/intern/mesh.c
branches/particles-2010/source/blender/blenkernel/intern/multires.c
branches/particles-2010/source/blender/blenkernel/intern/nla.c
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenkernel/intern/object.c
branches/particles-2010/source/blender/blenkernel/intern/packedFile.c
branches/particles-2010/source/blender/blenkernel/intern/particle.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/particleset.c
branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
branches/particles-2010/source/blender/blenkernel/intern/scene.c
branches/particles-2010/source/blender/blenkernel/intern/seqcache.c
branches/particles-2010/source/blender/blenkernel/intern/seqeffects.c
branches/particles-2010/source/blender/blenkernel/intern/sequencer.c
branches/particles-2010/source/blender/blenkernel/intern/smoke.c
branches/particles-2010/source/blender/blenkernel/intern/sound.c
branches/particles-2010/source/blender/blenkernel/intern/text.c
branches/particles-2010/source/blender/blenkernel/intern/texture.c
branches/particles-2010/source/blender/blenkernel/intern/unit.c
branches/particles-2010/source/blender/blenkernel/intern/world.c
branches/particles-2010/source/blender/blenlib/BLI_bpath.h
branches/particles-2010/source/blender/blenlib/BLI_fileops.h
branches/particles-2010/source/blender/blenlib/BLI_math_matrix.h
branches/particles-2010/source/blender/blenlib/BLI_math_vector.h
branches/particles-2010/source/blender/blenlib/BLI_path_util.h
branches/particles-2010/source/blender/blenlib/BLI_storage.h
branches/particles-2010/source/blender/blenlib/BLI_winstuff.h
branches/particles-2010/source/blender/blenlib/CMakeLists.txt
branches/particles-2010/source/blender/blenlib/SConscript
branches/particles-2010/source/blender/blenlib/intern/bpath.c
branches/particles-2010/source/blender/blenlib/intern/fileops.c
branches/particles-2010/source/blender/blenlib/intern/math_matrix.c
branches/particles-2010/source/blender/blenlib/intern/math_rotation.c
branches/particles-2010/source/blender/blenlib/intern/math_vector_inline.c
branches/particles-2010/source/blender/blenlib/intern/path_util.c
branches/particles-2010/source/blender/blenlib/intern/storage.c
branches/particles-2010/source/blender/blenloader/BLO_readfile.h
branches/particles-2010/source/blender/blenloader/intern/readblenentry.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/blenloader/intern/readfile.h
branches/particles-2010/source/blender/blenpluginapi/CMakeLists.txt
branches/particles-2010/source/blender/collada/AnimationImporter.cpp
branches/particles-2010/source/blender/collada/DocumentImporter.cpp
branches/particles-2010/source/blender/collada/GeometryExporter.cpp
branches/particles-2010/source/blender/collada/GeometryExporter.h
branches/particles-2010/source/blender/collada/ImageExporter.cpp
branches/particles-2010/source/blender/collada/SkinInfo.cpp
branches/particles-2010/source/blender/collada/collada_internal.cpp
branches/particles-2010/source/blender/collada/collada_utils.cpp
branches/particles-2010/source/blender/editors/animation/anim_channels_defines.c
branches/particles-2010/source/blender/editors/animation/anim_channels_edit.c
branches/particles-2010/source/blender/editors/animation/anim_draw.c
branches/particles-2010/source/blender/editors/animation/anim_filter.c
branches/particles-2010/source/blender/editors/animation/keyframing.c
branches/particles-2010/source/blender/editors/animation/keyingsets.c
branches/particles-2010/source/blender/editors/armature/CMakeLists.txt
branches/particles-2010/source/blender/editors/armature/editarmature.c
branches/particles-2010/source/blender/editors/curve/curve_intern.h
branches/particles-2010/source/blender/editors/curve/curve_ops.c
branches/particles-2010/source/blender/editors/curve/editcurve.c
branches/particles-2010/source/blender/editors/curve/editfont.c
branches/particles-2010/source/blender/editors/datafiles/SConscript
branches/particles-2010/source/blender/editors/include/ED_anim_api.h
branches/particles-2010/source/blender/editors/include/ED_armature.h
branches/particles-2010/source/blender/editors/include/ED_curve.h
branches/particles-2010/source/blender/editors/include/ED_info.h
branches/particles-2010/source/blender/editors/include/ED_keyframing.h
branches/particles-2010/source/blender/editors/include/ED_mball.h
branches/particles-2010/source/blender/editors/include/ED_mesh.h
branches/particles-2010/source/blender/editors/include/ED_object.h
branches/particles-2010/source/blender/editors/include/ED_particle.h
branches/particles-2010/source/blender/editors/include/ED_screen.h
branches/particles-2010/source/blender/editors/include/ED_util.h
branches/particles-2010/source/blender/editors/include/ED_view3d.h
branches/particles-2010/source/blender/editors/include/UI_interface.h
branches/particles-2010/source/blender/editors/include/UI_interface_icons.h
branches/particles-2010/source/blender/editors/interface/interface.c
branches/particles-2010/source/blender/editors/interface/interface_anim.c
branches/particles-2010/source/blender/editors/interface/interface_draw.c
branches/particles-2010/source/blender/editors/interface/interface_handlers.c
branches/particles-2010/source/blender/editors/interface/interface_icons.c
branches/particles-2010/source/blender/editors/interface/interface_intern.h
branches/particles-2010/source/blender/editors/interface/interface_layout.c
branches/particles-2010/source/blender/editors/interface/interface_ops.c
branches/particles-2010/source/blender/editors/interface/interface_regions.c
branches/particles-2010/source/blender/editors/interface/interface_style.c
branches/particles-2010/source/blender/editors/interface/interface_templates.c
branches/particles-2010/source/blender/editors/interface/view2d.c
branches/particles-2010/source/blender/editors/interface/view2d_ops.c
branches/particles-2010/source/blender/editors/mesh/CMakeLists.txt
branches/particles-2010/source/blender/editors/mesh/editmesh.c
branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
branches/particles-2010/source/blender/editors/mesh/loopcut.c
branches/particles-2010/source/blender/editors/mesh/mesh_ops.c
branches/particles-2010/source/blender/editors/mesh/meshtools.c
branches/particles-2010/source/blender/editors/metaball/mball_edit.c
branches/particles-2010/source/blender/editors/object/CMakeLists.txt
branches/particles-2010/source/blender/editors/object/object_add.c
branches/particles-2010/source/blender/editors/object/object_edit.c
branches/particles-2010/source/blender/editors/object/object_group.c
branches/particles-2010/source/blender/editors/object/object_lattice.c
branches/particles-2010/source/blender/editors/object/object_modifier.c
branches/particles-2010/source/blender/editors/object/object_relations.c
branches/particles-2010/source/blender/editors/object/object_select.c
branches/particles-2010/source/blender/editors/object/object_transform.c
branches/particles-2010/source/blender/editors/object/object_vgroup.c
branches/particles-2010/source/blender/editors/physics/CMakeLists.txt
branches/particles-2010/source/blender/editors/physics/particle_edit.c
branches/particles-2010/source/blender/editors/physics/particle_object.c
branches/particles-2010/source/blender/editors/render/CMakeLists.txt
branches/particles-2010/source/blender/editors/render/Makefile
branches/particles-2010/source/blender/editors/render/render_internal.c
branches/particles-2010/source/blender/editors/render/render_opengl.c
branches/particles-2010/source/blender/editors/render/render_preview.c
branches/particles-2010/source/blender/editors/screen/CMakeLists.txt
branches/particles-2010/source/blender/editors/screen/area.c
branches/particles-2010/source/blender/editors/screen/screen_edit.c
branches/particles-2010/source/blender/editors/screen/screen_ops.c
branches/particles-2010/source/blender/editors/screen/screendump.c
branches/particles-2010/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
branches/particles-2010/source/blender/editors/sound/sound_ops.c
branches/particles-2010/source/blender/editors/space_action/action_edit.c
branches/particles-2010/source/blender/editors/space_buttons/space_buttons.c
branches/particles-2010/source/blender/editors/space_console/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_console/console_draw.c
branches/particles-2010/source/blender/editors/space_console/console_intern.h
branches/particles-2010/source/blender/editors/space_console/console_ops.c
branches/particles-2010/source/blender/editors/space_console/space_console.c
branches/particles-2010/source/blender/editors/space_file/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_file/file_draw.c
branches/particles-2010/source/blender/editors/space_file/file_intern.h
branches/particles-2010/source/blender/editors/space_file/filesel.c
branches/particles-2010/source/blender/editors/space_graph/graph_draw.c
branches/particles-2010/source/blender/editors/space_graph/graph_edit.c
branches/particles-2010/source/blender/editors/space_graph/graph_ops.c
branches/particles-2010/source/blender/editors/space_graph/graph_utils.c
branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_image/SConscript
branches/particles-2010/source/blender/editors/space_image/image_buttons.c
branches/particles-2010/source/blender/editors/space_image/image_ops.c
branches/particles-2010/source/blender/editors/space_image/space_image.c
branches/particles-2010/source/blender/editors/space_info/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_info/info_intern.h
branches/particles-2010/source/blender/editors/space_info/info_ops.c
branches/particles-2010/source/blender/editors/space_info/space_info.c
branches/particles-2010/source/blender/editors/space_logic/logic_window.c
branches/particles-2010/source/blender/editors/space_nla/nla_ops.c
branches/particles-2010/source/blender/editors/space_nla/space_nla.c
branches/particles-2010/source/blender/editors/space_node/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_outliner/outliner.c
branches/particles-2010/source/blender/editors/space_script/script_edit.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_draw.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
branches/particles-2010/source/blender/editors/space_text/text_draw.c
branches/particles-2010/source/blender/editors/space_view3d/CMakeLists.txt
branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_buttons.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_fly.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_intern.h
branches/particles-2010/source/blender/editors/space_view3d/view3d_toolbar.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
branches/particles-2010/source/blender/editors/transform/transform.c
branches/particles-2010/source/blender/editors/transform/transform.h
branches/particles-2010/source/blender/editors/transform/transform_constraints.c
branches/particles-2010/source/blender/editors/transform/transform_conversions.c
branches/particles-2010/source/blender/editors/transform/transform_generics.c
branches/particles-2010/source/blender/editors/transform/transform_manipulator.c
branches/particles-2010/source/blender/editors/transform/transform_ops.c
branches/particles-2010/source/blender/editors/transform/transform_snap.c
branches/particles-2010/source/blender/editors/util/editmode_undo.c
branches/particles-2010/source/blender/editors/util/undo.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
branches/particles-2010/source/blender/gpu/CMakeLists.txt
branches/particles-2010/source/blender/gpu/GPU_extensions.h
branches/particles-2010/source/blender/gpu/intern/gpu_buffers.c
branches/particles-2010/source/blender/gpu/intern/gpu_extensions.c
branches/particles-2010/source/blender/imbuf/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/IMB_imbuf.h
branches/particles-2010/source/blender/imbuf/intern/IMB_filetype.h
branches/particles-2010/source/blender/imbuf/intern/anim_movie.c
branches/particles-2010/source/blender/imbuf/intern/bmp.c
branches/particles-2010/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/intern/cineon/SConscript
branches/particles-2010/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/particles-2010/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/intern/dds/SConscript
branches/particles-2010/source/blender/imbuf/intern/dds/dds_api.cpp
branches/particles-2010/source/blender/imbuf/intern/dds/dds_api.h
branches/particles-2010/source/blender/imbuf/intern/iris.c
branches/particles-2010/source/blender/imbuf/intern/jp2.c
branches/particles-2010/source/blender/imbuf/intern/jpeg.c
branches/particles-2010/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/particles-2010/source/blender/imbuf/intern/openexr/SConscript
branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_api.h
branches/particles-2010/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/particles-2010/source/blender/imbuf/intern/png.c
branches/particles-2010/source/blender/imbuf/intern/radiance_hdr.c
branches/particles-2010/source/blender/imbuf/intern/targa.c
branches/particles-2010/source/blender/imbuf/intern/tiff.c
branches/particles-2010/source/blender/imbuf/intern/util.c
branches/particles-2010/source/blender/imbuf/intern/writeimage.c
branches/particles-2010/source/blender/makesdna/DNA_action_types.h
branches/particles-2010/source/blender/makesdna/DNA_anim_types.h
branches/particles-2010/source/blender/makesdna/DNA_curve_types.h
branches/particles-2010/source/blender/makesdna/DNA_image_types.h
branches/particles-2010/source/blender/makesdna/DNA_lattice_types.h
branches/particles-2010/source/blender/makesdna/DNA_scene_types.h
branches/particles-2010/source/blender/makesdna/DNA_screen_types.h
branches/particles-2010/source/blender/makesdna/DNA_smoke_types.h
branches/particles-2010/source/blender/makesdna/DNA_space_types.h
branches/particles-2010/source/blender/makesdna/DNA_texture_types.h
branches/particles-2010/source/blender/makesdna/DNA_userdef_types.h
branches/particles-2010/source/blender/makesdna/DNA_view3d_types.h
branches/particles-2010/source/blender/makesdna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesrna/RNA_access.h
branches/particles-2010/source/blender/makesrna/RNA_define.h
branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
branches/particles-2010/source/blender/makesrna/RNA_types.h
branches/particles-2010/source/blender/makesrna/SConscript
branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesrna/intern/SConscript
branches/particles-2010/source/blender/makesrna/intern/makesrna.c
branches/particles-2010/source/blender/makesrna/intern/rna_access.c
branches/particles-2010/source/blender/makesrna/intern/rna_action.c
branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
branches/particles-2010/source/blender/makesrna/intern/rna_animation.c
branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
branches/particles-2010/source/blender/makesrna/intern/rna_armature_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_boid.c
branches/particles-2010/source/blender/makesrna/intern/rna_camera.c
branches/particles-2010/source/blender/makesrna/intern/rna_constraint.c
branches/particles-2010/source/blender/makesrna/intern/rna_curve.c
branches/particles-2010/source/blender/makesrna/intern/rna_define.c
branches/particles-2010/source/blender/makesrna/intern/rna_fluidsim.c
branches/particles-2010/source/blender/makesrna/intern/rna_image.c
branches/particles-2010/source/blender/makesrna/intern/rna_image_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_main_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_material.c
branches/particles-2010/source/blender/makesrna/intern/rna_mesh.c
branches/particles-2010/source/blender/makesrna/intern/rna_meta.c
branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree_types.h
branches/particles-2010/source/blender/makesrna/intern/rna_object.c
branches/particles-2010/source/blender/makesrna/intern/rna_object_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
branches/particles-2010/source/blender/makesrna/intern/rna_pose.c
branches/particles-2010/source/blender/makesrna/intern/rna_rna.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_screen.c
branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/particles-2010/source/blender/makesrna/intern/rna_sensor.c
branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
branches/particles-2010/source/blender/makesrna/intern/rna_space.c
branches/particles-2010/source/blender/makesrna/intern/rna_texture.c
branches/particles-2010/source/blender/makesrna/intern/rna_ui_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_userdef.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_world.c
branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/particles-2010/source/blender/modifiers/Makefile
branches/particles-2010/source/blender/modifiers/intern/MOD_armature.c
branches/particles-2010/source/blender/modifiers/intern/MOD_array.c
branches/particles-2010/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/particles-2010/source/blender/modifiers/intern/MOD_particlesystem.c
branches/particles-2010/source/blender/modifiers/intern/Makefile
branches/particles-2010/source/blender/nodes/CMakeLists.txt
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
branches/particles-2010/source/blender/python/BPY_extern.h
branches/particles-2010/source/blender/python/CMakeLists.txt
branches/particles-2010/source/blender/python/generic/CMakeLists.txt
branches/particles-2010/source/blender/python/generic/IDProp.c
branches/particles-2010/source/blender/python/generic/IDProp.h
branches/particles-2010/source/blender/python/generic/bgl.h
branches/particles-2010/source/blender/python/generic/blf_api.c
branches/particles-2010/source/blender/python/generic/mathutils_color.c
branches/particles-2010/source/blender/python/generic/mathutils_euler.c
branches/particles-2010/source/blender/python/generic/mathutils_geometry.c
branches/particles-2010/source/blender/python/generic/mathutils_matrix.c
branches/particles-2010/source/blender/python/generic/mathutils_matrix.h
branches/particles-2010/source/blender/python/generic/mathutils_quat.c
branches/particles-2010/source/blender/python/generic/mathutils_vector.c
branches/particles-2010/source/blender/python/intern/bpy.c
branches/particles-2010/source/blender/python/intern/bpy_interface.c
branches/particles-2010/source/blender/python/intern/bpy_operator.c
branches/particles-2010/source/blender/python/intern/bpy_props.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/python/intern/bpy_rna_callback.c
branches/particles-2010/source/blender/python/intern/bpy_util.c
branches/particles-2010/source/blender/python/intern/stubs.c
branches/particles-2010/source/blender/quicktime/apple/qtkit_import.m
branches/particles-2010/source/blender/quicktime/apple/quicktime_import.c
branches/particles-2010/source/blender/quicktime/quicktime_import.h
branches/particles-2010/source/blender/render/CMakeLists.txt
branches/particles-2010/source/blender/render/extern/include/RE_pipeline.h
branches/particles-2010/source/blender/render/intern/source/convertblender.c
branches/particles-2010/source/blender/render/intern/source/pipeline.c
branches/particles-2010/source/blender/render/intern/source/rayshade.c
branches/particles-2010/source/blender/render/intern/source/rendercore.c
branches/particles-2010/source/blender/render/intern/source/shadeoutput.c
branches/particles-2010/source/blender/render/intern/source/texture.c
branches/particles-2010/source/blender/render/intern/source/voxeldata.c
branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
branches/particles-2010/source/blender/windowmanager/WM_api.h
branches/particles-2010/source/blender/windowmanager/WM_types.h
branches/particles-2010/source/blender/windowmanager/intern/wm.c
branches/particles-2010/source/blender/windowmanager/intern/wm_dragdrop.c
branches/particles-2010/source/blender/windowmanager/intern/wm_draw.c
branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
branches/particles-2010/source/blender/windowmanager/intern/wm_keymap.c
branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
branches/particles-2010/source/blender/windowmanager/intern/wm_window.c
branches/particles-2010/source/blenderplayer/CMakeLists.txt
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/creator.c
branches/particles-2010/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/particles-2010/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/particles-2010/source/gameengine/BlenderRoutines/SConscript
branches/particles-2010/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/particles-2010/source/gameengine/Converter/CMakeLists.txt
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/particles-2010/source/gameengine/Converter/SConscript
branches/particles-2010/source/gameengine/Expressions/CMakeLists.txt
branches/particles-2010/source/gameengine/Expressions/KX_Python.h
branches/particles-2010/source/gameengine/Expressions/SConscript
branches/particles-2010/source/gameengine/GameLogic/CMakeLists.txt
branches/particles-2010/source/gameengine/GameLogic/SConscript
branches/particles-2010/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/common/SConscript
branches/particles-2010/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/particles-2010/source/gameengine/GamePlayer/ghost/SConscript
branches/particles-2010/source/gameengine/Ketsji/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Ketsji/KX_Camera.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_Scene.cpp
branches/particles-2010/source/gameengine/Ketsji/SConscript
branches/particles-2010/source/gameengine/Network/CMakeLists.txt
branches/particles-2010/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/particles-2010/source/gameengine/Network/LoopBackNetwork/SConscript
branches/particles-2010/source/gameengine/Network/SConscript
branches/particles-2010/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/Bullet/SConscript
branches/particles-2010/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/Dummy/SConscript
branches/particles-2010/source/gameengine/Physics/common/CMakeLists.txt
branches/particles-2010/source/gameengine/Physics/common/SConscript
branches/particles-2010/source/gameengine/Rasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/particles-2010/source/gameengine/Rasterizer/SConscript
branches/particles-2010/source/gameengine/SceneGraph/CMakeLists.txt
branches/particles-2010/source/gameengine/SceneGraph/SConscript
branches/particles-2010/source/gameengine/VideoTexture/CMakeLists.txt
branches/particles-2010/source/gameengine/VideoTexture/SConscript
branches/particles-2010/source/kernel/CMakeLists.txt
branches/particles-2010/source/kernel/SConscript
branches/particles-2010/source/kernel/gen_system/SYS_SingletonSystem.cpp
branches/particles-2010/source/kernel/gen_system/SYS_SingletonSystem.h
Added Paths:
-----------
branches/particles-2010/release/scripts/templates/operator_export.py
branches/particles-2010/source/blender/editors/space_info/info_draw.c
branches/particles-2010/source/blender/editors/space_info/info_report.c
branches/particles-2010/source/blender/editors/space_info/textview.c
branches/particles-2010/source/blender/editors/space_info/textview.h
branches/particles-2010/source/blender/python/intern/CMakeLists.txt
branches/particles-2010/source/blender/python/intern/bpy_rna_array.c
Removed Paths:
-------------
branches/particles-2010/release/scripts/templates/operator.py
branches/particles-2010/release/windows/BlenderPlayer/
branches/particles-2010/release/windows/extra/
branches/particles-2010/release/windows/specific.sh
branches/particles-2010/source/blender/blenlib/BLI_bfile.h
branches/particles-2010/source/blender/blenlib/intern/BLI_bfile.c
branches/particles-2010/source/blender/editors/space_console/console_report.c
branches/particles-2010/source/blender/editors/space_file/writeimage.c
branches/particles-2010/source/blender/python/intern/bpy_array.c
branches/particles-2010/source/gameengine/GamePlayer/ActiveX/
branches/particles-2010/source/gameengine/GamePlayer/netscape/
branches/particles-2010/source/kernel/gen_system/GEN_DataCache.h
branches/particles-2010/source/kernel/gen_system/GEN_Matrix4x4.cpp
branches/particles-2010/source/kernel/gen_system/GEN_Matrix4x4.h
branches/particles-2010/source/kernel/gen_system/GEN_SmartPtr.h
branches/particles-2010/source/tools/cygwin/
branches/particles-2010/source/tools/hmake/
branches/particles-2010/source/tools/wrap.pl
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2010-11-25 12:09:37 UTC (rev 33305)
+++ branches/particles-2010/CMakeLists.txt 2010-11-25 13:04:53 UTC (rev 33306)
@@ -97,9 +97,9 @@
# Audio format support
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-IF(APPLE OR WIN32)
+IF(APPLE OR (WIN32 AND NOT UNIX))
OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
-ENDIF(APPLE OR WIN32)
+ENDIF(APPLE OR (WIN32 AND NOT UNIX))
# 3D format support
# disable opencollada on non-apple unix because opencollada has no package for debian
@@ -113,6 +113,7 @@
OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_SAMPLERATE "Enable samplerate conversion" ON)
# Compression
OPTION(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
@@ -141,6 +142,10 @@
MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+IF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+ MESSAGE(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK need WITH_SAMPLERATE")
+ENDIF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+
TEST_SSE_SUPPORT()
# disabled for now, not supported
@@ -284,10 +289,12 @@
SET(OPENCL_LIB OpenCL)
ENDIF(WITH_OPENCL)
- SET(LIBSAMPLERATE /usr)
- SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- SET(LIBSAMPLERATE_LIB samplerate)
- SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ IF(WITH_SAMPLERATE)
+ SET(LIBSAMPLERATE /usr)
+ SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+ SET(LIBSAMPLERATE_LIB samplerate)
+ SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ ENDIF(WITH_SAMPLERATE)
IF (WITH_OPENCOLLADA)
SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
@@ -316,17 +323,12 @@
SET(BINRELOC_INC ${BINRELOC}/include)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- IF(WITH_OPENMP)
- LIST(APPEND LLIBS -lgomp)
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
- ENDIF(WITH_OPENMP)
-
SET(PLATFORM_LINKFLAGS "-pthread")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
+ # GNU Compiler
IF(CMAKE_COMPILER_IS_GNUCC)
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
@@ -334,12 +336,37 @@
# note: -Wunused-parameter is added below for all GCC compilers
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+
+ # Intel C++ Compiler
+ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Intel")
+ # think these next two are broken
+ FIND_PROGRAM(XIAR xiar)
+ IF(XIAR)
+ SET(CMAKE_AR "${XIAR}")
+ ENDIF(XIAR)
+ MARK_AS_ADVANCED(XIAR)
+
+ FIND_PROGRAM(XILD xild)
+ IF(XILD)
+ SET(CMAKE_LINKER "${XILD}")
+ ENDIF(XILD)
+ MARK_AS_ADVANCED(XILD)
+
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise -prec_div -parallel")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fp-model precise -prec_div -parallel")
+
+ SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+
+ # SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -diag-enable sc3")
+
+ SET(C_WARNINGS "-Wall -Wpointer-arith -Wno-unknown-pragmas")
+ SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+
+ SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-intel")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
-ENDIF(UNIX AND NOT APPLE)
+ELSEIF(WIN32)
-IF(WIN32)
-
# this file is included anyway when building under Windows with cl.exe
# INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
@@ -360,10 +387,12 @@
SET(ICONV_LIBPATH ${ICONV}/lib)
ENDIF(WITH_INTERNATIONAL)
- SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
- SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- SET(LIBSAMPLERATE_LIB libsamplerate)
- SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ IF(WITH_SAMPLERATE)
+ SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+ SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+ SET(LIBSAMPLERATE_LIB libsamplerate)
+ SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ ENDIF(WITH_SAMPLERATE)
SET(PNG "${LIBDIR}/png")
SET(PNG_INC "${PNG}/include")
@@ -433,12 +462,7 @@
SET(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
-
- IF(WITH_OPENMP)
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
- ENDIF(WITH_OPENMP)
-
+
IF(WITH_INTERNATIONAL)
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC ${GETTEXT}/include)
@@ -544,7 +568,7 @@
# MSVC only, Mingw doesnt need
IF(CMAKE_CL_64)
- SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+ SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib ")
ELSE(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
ENDIF(CMAKE_CL_64)
@@ -560,12 +584,6 @@
# Better warnings
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
-
- IF(WITH_OPENMP)
- SET(LLIBS "${LLIBS} -lgomp")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
- ENDIF(WITH_OPENMP)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
@@ -661,10 +679,11 @@
ENDIF(MSVC)
-ENDIF(WIN32)
+ # used in many places so include globally, like OpenGL
+ INCLUDE_DIRECTORIES(${PTHREADS_INC})
+ELSEIF(APPLE)
-IF(APPLE)
IF(WITH_LIBS10.5)
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
ELSE(WITH_LIBS10.5)
@@ -771,10 +790,12 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
ENDIF(WITH_FFMPEG)
- SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
- SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
- SET(LIBSAMPLERATE_LIB samplerate)
- SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ IF(WITH_SAMPLERATE)
+ SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+ SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+ SET(LIBSAMPLERATE_LIB samplerate)
+ SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ ENDIF(WITH_SAMPLERATE)
SET(LLIBS stdc++ SystemStubs)
@@ -796,12 +817,6 @@
SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
ENDIF (WITH_COCOA)
- IF(WITH_OPENMP)
- SET(LLIBS "${LLIBS} -lgomp")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
- ENDIF(WITH_OPENMP)
-
IF (WITH_OPENCOLLADA)
SET(OPENCOLLADA ${LIBDIR}/opencollada)
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
@@ -858,7 +873,7 @@
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
-ENDIF(APPLE)
+ENDIF(UNIX AND NOT APPLE)
# buildinfo
@@ -926,6 +941,22 @@
# UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake
#-----------------------------------------------------------------------------
+# Configure OpenMP.
+IF(WITH_OPENMP)
+ FIND_PACKAGE(OpenMP)
+ IF(OPENMP_FOUND)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+
+ IF(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode")
+ SET(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES")
+ ENDIF(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode")
+ ELSE(OPENMP_FOUND)
+ SET(WITH_OPENMP OFF)
+ ENDIF(OPENMP_FOUND)
+ENDIF(WITH_OPENMP)
+
+#-----------------------------------------------------------------------------
# Extra compile flags
IF((NOT WIN32) AND (NOT MSVC))
Modified: branches/particles-2010/build_files/cmake/macros.cmake
===================================================================
--- branches/particles-2010/build_files/cmake/macros.cmake 2010-11-25 12:09:37 UTC (rev 33305)
+++ branches/particles-2010/build_files/cmake/macros.cmake 2010-11-25 13:04:53 UTC (rev 33306)
@@ -14,17 +14,15 @@
ADD_LIBRARY(${name} ${INC_ALL} ${sources})
# Group by location on disk
- SOURCE_GROUP(Files FILES CMakeLists.txt)
+ SOURCE_GROUP("Source Files" FILES CMakeLists.txt)
SET(ALL_FILES ${sources} ${INC_ALL})
FOREACH(SRC ${ALL_FILES})
- STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
- STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
- STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
- IF(REL_DIR)
- SOURCE_GROUP(${REL_DIR} FILES ${SRC})
- ELSE(REL_DIR)
- SOURCE_GROUP(Files FILES ${SRC})
- ENDIF(REL_DIR)
+ GET_FILENAME_COMPONENT(SRC_EXT ${SRC} EXT)
+ IF(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
+ SOURCE_GROUP("Header Files" FILES ${SRC})
+ ELSE()
+ SOURCE_GROUP("Source Files" FILES ${SRC})
+ ENDIF()
ENDFOREACH(SRC)
ENDMACRO(BLENDERLIB_NOLIST)
@@ -57,8 +55,8 @@
CMAKE_POLICY(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
- LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
-
+ LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
+
IF(WITH_PYTHON)
LINK_DIRECTORIES(${PYTHON_LIBPATH})
ENDIF(WITH_PYTHON)
@@ -93,6 +91,9 @@
IF(WITH_SNDFILE)
LINK_DIRECTORIES(${SNDFILE_LIBPATH})
ENDIF(WITH_SNDFILE)
+ IF(WITH_SAMPLERATE)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list