[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39143] branches/cycles: Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Aug 7 15:21:06 CEST 2011
Revision: 39143
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39143
Author: blendix
Date: 2011-08-07 13:21:04 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37957
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/GNUmakefile
branches/cycles/SConstruct
branches/cycles/build_files/buildbot/config/user-config-i686.py
branches/cycles/build_files/buildbot/config/user-config-player-i686.py
branches/cycles/build_files/buildbot/config/user-config-player-x86_64.py
branches/cycles/build_files/buildbot/config/user-config-x86_64.py
branches/cycles/build_files/buildbot/master.cfg
branches/cycles/build_files/buildbot/slave_compile.py
branches/cycles/build_files/buildbot/slave_pack.py
branches/cycles/build_files/cmake/cmake_consistency_check.py
branches/cycles/build_files/cmake/cmake_netbeans_project.py
branches/cycles/build_files/cmake/cmake_qtcreator_project.py
branches/cycles/build_files/cmake/macros.cmake
branches/cycles/build_files/scons/config/darwin-config.py
branches/cycles/build_files/scons/config/linux2-config.py
branches/cycles/build_files/scons/config/win32-vc-config.py
branches/cycles/build_files/scons/config/win64-vc-config.py
branches/cycles/build_files/scons/tools/Blender.py
branches/cycles/build_files/scons/tools/btools.py
branches/cycles/doc/python_api/blender-org/static/default.css_t
branches/cycles/doc/python_api/examples/bpy.types.RenderEngine.py
branches/cycles/doc/python_api/examples/mathutils.Vector.py
branches/cycles/doc/python_api/rst/bge.events.rst
branches/cycles/doc/python_api/rst/bge.logic.rst
branches/cycles/doc/python_api/rst/bge.render.rst
branches/cycles/doc/python_api/rst/bge.types.rst
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/doc/python_api/sphinx_doc_gen.sh
branches/cycles/extern/binreloc/CMakeLists.txt
branches/cycles/extern/eltopo/CMakeLists.txt
branches/cycles/extern/glew/CMakeLists.txt
branches/cycles/extern/lzo/CMakeLists.txt
branches/cycles/intern/CMakeLists.txt
branches/cycles/intern/audaspace/CMakeLists.txt
branches/cycles/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/cycles/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/cycles/intern/boolop/CMakeLists.txt
branches/cycles/intern/bsp/CMakeLists.txt
branches/cycles/intern/ffmpeg/ffmpeg_compat.h
branches/cycles/intern/ghost/CMakeLists.txt
branches/cycles/intern/ghost/GHOST_C-api.h
branches/cycles/intern/ghost/GHOST_ISystem.h
branches/cycles/intern/ghost/GHOST_Types.h
branches/cycles/intern/ghost/SConscript
branches/cycles/intern/ghost/intern/GHOST_C-api.cpp
branches/cycles/intern/ghost/intern/GHOST_Debug.h
branches/cycles/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
branches/cycles/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/cycles/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/cycles/intern/ghost/intern/GHOST_EventManager.cpp
branches/cycles/intern/ghost/intern/GHOST_EventNDOF.h
branches/cycles/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/cycles/intern/ghost/intern/GHOST_EventPrinter.h
branches/cycles/intern/ghost/intern/GHOST_ISystem.cpp
branches/cycles/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/cycles/intern/ghost/intern/GHOST_NDOFManager.h
branches/cycles/intern/ghost/intern/GHOST_System.cpp
branches/cycles/intern/ghost/intern/GHOST_System.h
branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.h
branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/cycles/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemWin32.h
branches/cycles/intern/ghost/intern/GHOST_SystemX11.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemX11.h
branches/cycles/intern/ghost/intern/GHOST_TaskbarWin32.h
branches/cycles/intern/ghost/intern/GHOST_WindowNULL.h
branches/cycles/intern/ghost/intern/GHOST_WindowWin32.h
branches/cycles/intern/ghost/test/gears/GHOST_C-Test.c
branches/cycles/intern/ghost/test/gears/GHOST_Test.cpp
branches/cycles/intern/ghost/test/multitest/MultiTest.c
branches/cycles/intern/iksolver/intern/IK_QJacobian.cpp
branches/cycles/intern/iksolver/intern/IK_QJacobian.h
branches/cycles/intern/iksolver/intern/IK_QTask.cpp
branches/cycles/intern/mikktspace/mikktspace.c
branches/cycles/intern/smoke/CMakeLists.txt
branches/cycles/intern/smoke/intern/WAVELET_NOISE.h
branches/cycles/release/scripts/modules/addon_utils.py
branches/cycles/release/scripts/modules/bpy/__init__.py
branches/cycles/release/scripts/modules/bpy/ops.py
branches/cycles/release/scripts/modules/bpy/path.py
branches/cycles/release/scripts/modules/bpy/utils.py
branches/cycles/release/scripts/modules/bpy_extras/__init__.py
branches/cycles/release/scripts/modules/bpy_extras/image_utils.py
branches/cycles/release/scripts/modules/bpy_extras/io_utils.py
branches/cycles/release/scripts/modules/bpy_extras/mesh_utils.py
branches/cycles/release/scripts/modules/bpy_extras/object_utils.py
branches/cycles/release/scripts/modules/bpy_extras/view3d_utils.py
branches/cycles/release/scripts/modules/bpy_types.py
branches/cycles/release/scripts/modules/bpyml_ui.py
branches/cycles/release/scripts/modules/keyingsets_utils.py
branches/cycles/release/scripts/modules/rna_prop_ui.py
branches/cycles/release/scripts/presets/ffmpeg/xvid.py
branches/cycles/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/cycles/release/scripts/startup/bl_operators/image.py
branches/cycles/release/scripts/startup/bl_operators/mesh.py
branches/cycles/release/scripts/startup/bl_operators/object.py
branches/cycles/release/scripts/startup/bl_operators/object_align.py
branches/cycles/release/scripts/startup/bl_operators/object_quick_effects.py
branches/cycles/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/cycles/release/scripts/startup/bl_operators/presets.py
branches/cycles/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/cycles/release/scripts/startup/bl_ui/properties_animviz.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_armature.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_curve.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_empty.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/cycles/release/scripts/startup/bl_ui/properties_material.py
branches/cycles/release/scripts/startup/bl_ui/properties_object.py
branches/cycles/release/scripts/startup/bl_ui/properties_particle.py
branches/cycles/release/scripts/startup/bl_ui/properties_render.py
branches/cycles/release/scripts/startup/bl_ui/properties_texture.py
branches/cycles/release/scripts/startup/bl_ui/properties_world.py
branches/cycles/release/scripts/startup/bl_ui/space_image.py
branches/cycles/release/scripts/startup/bl_ui/space_info.py
branches/cycles/release/scripts/startup/bl_ui/space_node.py
branches/cycles/release/scripts/startup/bl_ui/space_text.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cycles/release/scripts/startup/keyingsets_builtins.py
branches/cycles/release/scripts/templates/addon_add_object.py
branches/cycles/source/blender/avi/AVI_avi.h
branches/cycles/source/blender/avi/CMakeLists.txt
branches/cycles/source/blender/avi/SConscript
branches/cycles/source/blender/avi/intern/avi.c
branches/cycles/source/blender/avi/intern/options.c
branches/cycles/source/blender/blenfont/CMakeLists.txt
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/BKE_curve.h
branches/cycles/source/blender/blenkernel/BKE_effect.h
branches/cycles/source/blender/blenkernel/BKE_global.h
branches/cycles/source/blender/blenkernel/BKE_material.h
branches/cycles/source/blender/blenkernel/BKE_node.h
branches/cycles/source/blender/blenkernel/CMakeLists.txt
branches/cycles/source/blender/blenkernel/SConscript
branches/cycles/source/blender/blenkernel/intern/BME_tools.c
branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
branches/cycles/source/blender/blenkernel/intern/anim.c
branches/cycles/source/blender/blenkernel/intern/blender.c
branches/cycles/source/blender/blenkernel/intern/boids.c
branches/cycles/source/blender/blenkernel/intern/cdderivedmesh.c
branches/cycles/source/blender/blenkernel/intern/curve.c
branches/cycles/source/blender/blenkernel/intern/customdata.c
branches/cycles/source/blender/blenkernel/intern/depsgraph.c
branches/cycles/source/blender/blenkernel/intern/effect.c
branches/cycles/source/blender/blenkernel/intern/image.c
branches/cycles/source/blender/blenkernel/intern/ipo.c
branches/cycles/source/blender/blenkernel/intern/key.c
branches/cycles/source/blender/blenkernel/intern/material.c
branches/cycles/source/blender/blenkernel/intern/mesh.c
branches/cycles/source/blender/blenkernel/intern/multires.c
branches/cycles/source/blender/blenkernel/intern/node.c
branches/cycles/source/blender/blenkernel/intern/particle.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenkernel/intern/pointcache.c
branches/cycles/source/blender/blenkernel/intern/seqeffects.c
branches/cycles/source/blender/blenkernel/intern/sequencer.c
branches/cycles/source/blender/blenkernel/intern/smoke.c
branches/cycles/source/blender/blenkernel/intern/softbody.c
branches/cycles/source/blender/blenkernel/intern/sound.c
branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c
branches/cycles/source/blender/blenkernel/intern/text.c
branches/cycles/source/blender/blenkernel/intern/texture.c
branches/cycles/source/blender/blenkernel/intern/writeavi.c
branches/cycles/source/blender/blenkernel/intern/writeframeserver.c
branches/cycles/source/blender/blenlib/BLI_math_base.h
branches/cycles/source/blender/blenlib/BLI_winstuff.h
branches/cycles/source/blender/blenlib/CMakeLists.txt
branches/cycles/source/blender/blenlib/intern/BLI_args.c
branches/cycles/source/blender/blenlib/intern/math_geom.c
branches/cycles/source/blender/blenlib/intern/path_util.c
branches/cycles/source/blender/blenlib/intern/pbvh.c
branches/cycles/source/blender/blenlib/intern/storage.c
branches/cycles/source/blender/blenlib/intern/uvproject.c
branches/cycles/source/blender/blenloader/BLO_readfile.h
branches/cycles/source/blender/blenloader/CMakeLists.txt
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/blenpluginapi/CMakeLists.txt
branches/cycles/source/blender/collada/ArmatureExporter.cpp
branches/cycles/source/blender/collada/ArmatureExporter.h
branches/cycles/source/blender/collada/CMakeLists.txt
branches/cycles/source/blender/collada/CameraExporter.cpp
branches/cycles/source/blender/collada/CameraExporter.h
branches/cycles/source/blender/collada/DocumentExporter.cpp
branches/cycles/source/blender/collada/DocumentExporter.h
branches/cycles/source/blender/collada/EffectExporter.cpp
branches/cycles/source/blender/collada/EffectExporter.h
branches/cycles/source/blender/collada/GeometryExporter.cpp
branches/cycles/source/blender/collada/GeometryExporter.h
branches/cycles/source/blender/collada/ImageExporter.cpp
branches/cycles/source/blender/collada/ImageExporter.h
branches/cycles/source/blender/collada/LightExporter.cpp
branches/cycles/source/blender/collada/LightExporter.h
branches/cycles/source/blender/collada/MaterialExporter.cpp
branches/cycles/source/blender/collada/MaterialExporter.h
branches/cycles/source/blender/collada/MeshImporter.cpp
branches/cycles/source/blender/collada/MeshImporter.h
branches/cycles/source/blender/collada/collada.cpp
branches/cycles/source/blender/collada/collada.h
branches/cycles/source/blender/collada/collada_internal.cpp
branches/cycles/source/blender/editors/CMakeLists.txt
branches/cycles/source/blender/editors/animation/CMakeLists.txt
branches/cycles/source/blender/editors/animation/anim_markers.c
branches/cycles/source/blender/editors/armature/CMakeLists.txt
branches/cycles/source/blender/editors/armature/armature_ops.c
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/armature/poseUtils.c
branches/cycles/source/blender/editors/curve/CMakeLists.txt
branches/cycles/source/blender/editors/curve/editcurve.c
branches/cycles/source/blender/editors/curve/editfont.c
branches/cycles/source/blender/editors/datafiles/CMakeLists.txt
branches/cycles/source/blender/editors/datafiles/preview.blend.c
branches/cycles/source/blender/editors/gpencil/CMakeLists.txt
branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
branches/cycles/source/blender/editors/include/BIF_glutil.h
branches/cycles/source/blender/editors/include/ED_curve.h
branches/cycles/source/blender/editors/include/ED_node.h
branches/cycles/source/blender/editors/include/ED_transform.h
branches/cycles/source/blender/editors/include/UI_interface.h
branches/cycles/source/blender/editors/include/UI_resources.h
branches/cycles/source/blender/editors/interface/CMakeLists.txt
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_anim.c
branches/cycles/source/blender/editors/interface/interface_draw.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_icons.c
branches/cycles/source/blender/editors/interface/interface_layout.c
branches/cycles/source/blender/editors/interface/interface_panel.c
branches/cycles/source/blender/editors/interface/interface_regions.c
branches/cycles/source/blender/editors/interface/interface_style.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/interface_utils.c
branches/cycles/source/blender/editors/interface/interface_widgets.c
branches/cycles/source/blender/editors/interface/resources.c
branches/cycles/source/blender/editors/mesh/CMakeLists.txt
branches/cycles/source/blender/editors/mesh/editmesh_loop.c
branches/cycles/source/blender/editors/metaball/CMakeLists.txt
branches/cycles/source/blender/editors/object/CMakeLists.txt
branches/cycles/source/blender/editors/object/object_add.c
branches/cycles/source/blender/editors/object/object_bake.c
branches/cycles/source/blender/editors/object/object_edit.c
branches/cycles/source/blender/editors/object/object_hook.c
branches/cycles/source/blender/editors/object/object_modifier.c
branches/cycles/source/blender/editors/object/object_relations.c
branches/cycles/source/blender/editors/physics/CMakeLists.txt
branches/cycles/source/blender/editors/physics/particle_edit.c
branches/cycles/source/blender/editors/physics/physics_fluid.c
branches/cycles/source/blender/editors/render/CMakeLists.txt
branches/cycles/source/blender/editors/render/render_opengl.c
branches/cycles/source/blender/editors/render/render_preview.c
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/screen/CMakeLists.txt
branches/cycles/source/blender/editors/screen/area.c
branches/cycles/source/blender/editors/screen/glutil.c
branches/cycles/source/blender/editors/screen/screen_edit.c
branches/cycles/source/blender/editors/screen/screen_ops.c
branches/cycles/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
branches/cycles/source/blender/editors/sculpt_paint/paint_stroke.c
branches/cycles/source/blender/editors/sound/CMakeLists.txt
branches/cycles/source/blender/editors/space_action/CMakeLists.txt
branches/cycles/source/blender/editors/space_api/CMakeLists.txt
branches/cycles/source/blender/editors/space_buttons/CMakeLists.txt
branches/cycles/source/blender/editors/space_buttons/buttons_context.c
branches/cycles/source/blender/editors/space_file/CMakeLists.txt
branches/cycles/source/blender/editors/space_file/file_ops.c
branches/cycles/source/blender/editors/space_graph/CMakeLists.txt
branches/cycles/source/blender/editors/space_image/CMakeLists.txt
branches/cycles/source/blender/editors/space_image/image_buttons.c
branches/cycles/source/blender/editors/space_image/image_intern.h
branches/cycles/source/blender/editors/space_image/image_ops.c
branches/cycles/source/blender/editors/space_image/space_image.c
branches/cycles/source/blender/editors/space_info/CMakeLists.txt
branches/cycles/source/blender/editors/space_logic/CMakeLists.txt
branches/cycles/source/blender/editors/space_nla/CMakeLists.txt
branches/cycles/source/blender/editors/space_node/CMakeLists.txt
branches/cycles/source/blender/editors/space_node/drawnode.c
branches/cycles/source/blender/editors/space_node/node_buttons.c
branches/cycles/source/blender/editors/space_node/node_draw.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_node/node_header.c
branches/cycles/source/blender/editors/space_node/node_intern.h
branches/cycles/source/blender/editors/space_node/node_ops.c
branches/cycles/source/blender/editors/space_node/space_node.c
branches/cycles/source/blender/editors/space_outliner/CMakeLists.txt
branches/cycles/source/blender/editors/space_outliner/outliner.c
branches/cycles/source/blender/editors/space_script/CMakeLists.txt
branches/cycles/source/blender/editors/space_sequencer/CMakeLists.txt
branches/cycles/source/blender/editors/space_sequencer/sequencer_add.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_draw.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cycles/source/blender/editors/space_sound/CMakeLists.txt
branches/cycles/source/blender/editors/space_text/CMakeLists.txt
branches/cycles/source/blender/editors/space_text/text_ops.c
branches/cycles/source/blender/editors/space_time/CMakeLists.txt
branches/cycles/source/blender/editors/space_userpref/CMakeLists.txt
branches/cycles/source/blender/editors/space_view3d/CMakeLists.txt
branches/cycles/source/blender/editors/space_view3d/drawarmature.c
branches/cycles/source/blender/editors/space_view3d/drawobject.c
branches/cycles/source/blender/editors/space_view3d/view3d_buttons.c
branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
branches/cycles/source/blender/editors/space_view3d/view3d_fly.c
branches/cycles/source/blender/editors/space_view3d/view3d_header.c
branches/cycles/source/blender/editors/space_view3d/view3d_intern.h
branches/cycles/source/blender/editors/space_view3d/view3d_ops.c
branches/cycles/source/blender/editors/space_view3d/view3d_select.c
branches/cycles/source/blender/editors/space_view3d/view3d_view.c
branches/cycles/source/blender/editors/transform/CMakeLists.txt
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform.h
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/editors/transform/transform_generics.c
branches/cycles/source/blender/editors/transform/transform_manipulator.c
branches/cycles/source/blender/editors/transform/transform_ops.c
branches/cycles/source/blender/editors/transform/transform_snap.c
branches/cycles/source/blender/editors/util/CMakeLists.txt
branches/cycles/source/blender/editors/util/undo.c
branches/cycles/source/blender/editors/uvedit/CMakeLists.txt
branches/cycles/source/blender/editors/uvedit/uvedit_ops.c
branches/cycles/source/blender/gpu/CMakeLists.txt
branches/cycles/source/blender/gpu/GPU_buffers.h
branches/cycles/source/blender/gpu/SConscript
branches/cycles/source/blender/gpu/intern/gpu_buffers.c
branches/cycles/source/blender/gpu/intern/gpu_draw.c
branches/cycles/source/blender/gpu/intern/gpu_material.c
branches/cycles/source/blender/ikplugin/CMakeLists.txt
branches/cycles/source/blender/imbuf/CMakeLists.txt
branches/cycles/source/blender/imbuf/IMB_imbuf.h
branches/cycles/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/cycles/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/cycles/source/blender/imbuf/intern/filter.c
branches/cycles/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/cycles/source/blender/imbuf/intern/util.c
branches/cycles/source/blender/makesdna/DNA_image_types.h
branches/cycles/source/blender/makesdna/DNA_material_types.h
branches/cycles/source/blender/makesdna/DNA_modifier_types.h
branches/cycles/source/blender/makesdna/DNA_node_types.h
branches/cycles/source/blender/makesdna/DNA_object_force.h
branches/cycles/source/blender/makesdna/DNA_particle_types.h
branches/cycles/source/blender/makesdna/DNA_scene_types.h
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesdna/DNA_userdef_types.h
branches/cycles/source/blender/makesdna/DNA_view3d_types.h
branches/cycles/source/blender/makesdna/DNA_windowmanager_types.h
branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
branches/cycles/source/blender/makesrna/intern/SConscript
branches/cycles/source/blender/makesrna/intern/rna_ID.c
branches/cycles/source/blender/makesrna/intern/rna_access.c
branches/cycles/source/blender/makesrna/intern/rna_action.c
branches/cycles/source/blender/makesrna/intern/rna_armature.c
branches/cycles/source/blender/makesrna/intern/rna_constraint.c
branches/cycles/source/blender/makesrna/intern/rna_curve.c
branches/cycles/source/blender/makesrna/intern/rna_image.c
branches/cycles/source/blender/makesrna/intern/rna_internal.h
branches/cycles/source/blender/makesrna/intern/rna_material.c
branches/cycles/source/blender/makesrna/intern/rna_modifier.c
branches/cycles/source/blender/makesrna/intern/rna_object.c
branches/cycles/source/blender/makesrna/intern/rna_object_api.c
branches/cycles/source/blender/makesrna/intern/rna_object_force.c
branches/cycles/source/blender/makesrna/intern/rna_pose.c
branches/cycles/source/blender/makesrna/intern/rna_render.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_scene_api.c
branches/cycles/source/blender/makesrna/intern/rna_userdef.c
branches/cycles/source/blender/makesrna/intern/rna_wm.c
branches/cycles/source/blender/makesrna/intern/rna_wm_api.c
branches/cycles/source/blender/modifiers/CMakeLists.txt
branches/cycles/source/blender/modifiers/intern/MOD_cast.c
branches/cycles/source/blender/modifiers/intern/MOD_displace.c
branches/cycles/source/blender/modifiers/intern/MOD_hook.c
branches/cycles/source/blender/modifiers/intern/MOD_meshdeform.c
branches/cycles/source/blender/modifiers/intern/MOD_simpledeform.c
branches/cycles/source/blender/modifiers/intern/MOD_smooth.c
branches/cycles/source/blender/modifiers/intern/MOD_solidify.c
branches/cycles/source/blender/modifiers/intern/MOD_util.c
branches/cycles/source/blender/modifiers/intern/MOD_util.h
branches/cycles/source/blender/modifiers/intern/MOD_uvproject.c
branches/cycles/source/blender/modifiers/intern/MOD_warp.c
branches/cycles/source/blender/modifiers/intern/MOD_wave.c
branches/cycles/source/blender/nodes/CMakeLists.txt
branches/cycles/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/cycles/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/cycles/source/blender/nodes/intern/CMP_util.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/cycles/source/blender/nodes/intern/SHD_util.c
branches/cycles/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
branches/cycles/source/blender/python/CMakeLists.txt
branches/cycles/source/blender/python/SConscript
branches/cycles/source/blender/python/generic/CMakeLists.txt
branches/cycles/source/blender/python/generic/bgl.c
branches/cycles/source/blender/python/generic/py_capi_utils.c
branches/cycles/source/blender/python/generic/py_capi_utils.h
branches/cycles/source/blender/python/intern/CMakeLists.txt
branches/cycles/source/blender/python/intern/bpy.c
branches/cycles/source/blender/python/intern/bpy_driver.c
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/python/intern/bpy_library.c
branches/cycles/source/blender/python/intern/bpy_operator.c
branches/cycles/source/blender/python/intern/bpy_props.c
branches/cycles/source/blender/python/intern/bpy_rna.c
branches/cycles/source/blender/python/intern/bpy_rna.h
branches/cycles/source/blender/quicktime/CMakeLists.txt
branches/cycles/source/blender/render/CMakeLists.txt
branches/cycles/source/blender/render/SConscript
branches/cycles/source/blender/render/extern/include/RE_pipeline.h
branches/cycles/source/blender/render/intern/source/convertblender.c
branches/cycles/source/blender/render/intern/source/pipeline.c
branches/cycles/source/blender/render/intern/source/rendercore.c
branches/cycles/source/blender/render/intern/source/shadeinput.c
branches/cycles/source/blender/render/intern/source/voxeldata.c
branches/cycles/source/blender/render/intern/source/zbuf.c
branches/cycles/source/blender/windowmanager/CMakeLists.txt
branches/cycles/source/blender/windowmanager/WM_api.h
branches/cycles/source/blender/windowmanager/WM_types.h
branches/cycles/source/blender/windowmanager/intern/wm.c
branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
branches/cycles/source/blender/windowmanager/intern/wm_files.c
branches/cycles/source/blender/windowmanager/intern/wm_init_exit.c
branches/cycles/source/blender/windowmanager/intern/wm_keymap.c
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/blender/windowmanager/intern/wm_window.c
branches/cycles/source/blender/windowmanager/wm_event_types.h
branches/cycles/source/blenderplayer/CMakeLists.txt
branches/cycles/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/cycles/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/cycles/source/creator/CMakeLists.txt
branches/cycles/source/creator/creator.c
branches/cycles/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/cycles/source/gameengine/Converter/CMakeLists.txt
branches/cycles/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/cycles/source/gameengine/Expressions/CMakeLists.txt
branches/cycles/source/gameengine/Expressions/PyObjectPlus.cpp
branches/cycles/source/gameengine/Expressions/PyObjectPlus.h
branches/cycles/source/gameengine/GameLogic/CMakeLists.txt
branches/cycles/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/cycles/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/cycles/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/SConscript
branches/cycles/source/gameengine/Ketsji/CMakeLists.txt
branches/cycles/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/cycles/source/gameengine/Ketsji/KX_Camera.cpp
branches/cycles/source/gameengine/Ketsji/KX_GameObject.cpp
branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/cycles/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/cycles/source/gameengine/Ketsji/KX_PyMath.h
branches/cycles/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/cycles/source/gameengine/Ketsji/SConscript
branches/cycles/source/gameengine/Network/CMakeLists.txt
branches/cycles/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/cycles/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/cycles/source/gameengine/Rasterizer/CMakeLists.txt
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/cycles/source/gameengine/VideoTexture/CMakeLists.txt
branches/cycles/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/cycles/build_files/cmake/Modules/FindSpacenav.cmake
branches/cycles/doc/python_api/examples/bge.constraints.py
branches/cycles/doc/python_api/examples/bge.texture.1.py
branches/cycles/doc/python_api/examples/bge.texture.py
branches/cycles/doc/python_api/examples/blf.py
branches/cycles/doc/python_api/rst/bge.constraints.rst
branches/cycles/doc/python_api/rst/bge.texture.rst
branches/cycles/doc/python_api/rst/bgl.rst
branches/cycles/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/cycles/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerWin32.h
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/cycles/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/cycles/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemSDL.h
branches/cycles/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/cycles/intern/ghost/intern/GHOST_WindowSDL.h
branches/cycles/intern/ghost/test/CMakeLists.txt
branches/cycles/release/scripts/templates/batch_export.py
branches/cycles/release/scripts/templates/ui_menu.py
branches/cycles/release/scripts/templates/ui_menu_simple.py
branches/cycles/release/scripts/templates/ui_panel_simple.py
branches/cycles/source/blender/python/mathutils/
branches/cycles/source/blender/python/mathutils/CMakeLists.txt
branches/cycles/source/blender/python/mathutils/mathutils.c
branches/cycles/source/blender/python/mathutils/mathutils.h
branches/cycles/source/blender/python/mathutils/mathutils_Color.c
branches/cycles/source/blender/python/mathutils/mathutils_Color.h
branches/cycles/source/blender/python/mathutils/mathutils_Euler.c
branches/cycles/source/blender/python/mathutils/mathutils_Euler.h
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.c
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.h
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.c
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.h
branches/cycles/source/blender/python/mathutils/mathutils_Vector.c
branches/cycles/source/blender/python/mathutils/mathutils_Vector.h
branches/cycles/source/blender/python/mathutils/mathutils_geometry.c
branches/cycles/source/blender/python/mathutils/mathutils_geometry.h
branches/cycles/source/blender/windowmanager/WM_keymap.h
branches/cycles/source/tests/check_deprecated.py
branches/cycles/source/tools/MakeGLStipple.py
Removed Paths:
-------------
branches/cycles/doc/python_api/epy/BGL.py
branches/cycles/release/scripts/templates/panel_simple.py
branches/cycles/source/blender/python/generic/mathutils.c
branches/cycles/source/blender/python/generic/mathutils.h
branches/cycles/source/blender/python/generic/mathutils_Color.c
branches/cycles/source/blender/python/generic/mathutils_Color.h
branches/cycles/source/blender/python/generic/mathutils_Euler.c
branches/cycles/source/blender/python/generic/mathutils_Euler.h
branches/cycles/source/blender/python/generic/mathutils_Matrix.c
branches/cycles/source/blender/python/generic/mathutils_Matrix.h
branches/cycles/source/blender/python/generic/mathutils_Quaternion.c
branches/cycles/source/blender/python/generic/mathutils_Quaternion.h
branches/cycles/source/blender/python/generic/mathutils_Vector.c
branches/cycles/source/blender/python/generic/mathutils_Vector.h
branches/cycles/source/blender/python/generic/mathutils_geometry.c
branches/cycles/source/blender/python/generic/mathutils_geometry.h
branches/cycles/source/blender/python/mathutils/CMakeLists.txt
branches/cycles/source/blender/python/mathutils/mathutils.c
branches/cycles/source/blender/python/mathutils/mathutils.h
branches/cycles/source/blender/python/mathutils/mathutils_Color.c
branches/cycles/source/blender/python/mathutils/mathutils_Color.h
branches/cycles/source/blender/python/mathutils/mathutils_Euler.c
branches/cycles/source/blender/python/mathutils/mathutils_Euler.h
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.c
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.h
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.c
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.h
branches/cycles/source/blender/python/mathutils/mathutils_Vector.c
branches/cycles/source/blender/python/mathutils/mathutils_Vector.h
branches/cycles/source/blender/python/mathutils/mathutils_geometry.c
branches/cycles/source/blender/python/mathutils/mathutils_geometry.h
Property Changed:
----------------
branches/cycles/
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-37957
+ /trunk:37695-37700
/trunk/blender:36353-39132
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-08-07 13:03:00 UTC (rev 39142)
+++ branches/cycles/CMakeLists.txt 2011-08-07 13:21:04 UTC (rev 39143)
@@ -91,6 +91,9 @@
get_blender_version()
# Blender internal features
+option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
+mark_as_advanced(WITH_BLENDER)
+
option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
@@ -107,12 +110,21 @@
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
-option(WITH_AUDASPACE "Build with blenders audio library" ON)
-mark_as_advanced(WITH_AUDASPACE)
+# GHOST Windowing Library Options
+option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
+mark_as_advanced(WITH_GHOST_DEBUG)
+option(WITH_GHOST_SDL "Enable building blender against SDL for windowing rather then the native APIs" OFF)
+mark_as_advanced(WITH_GHOST_SDL)
+
+# Misc...
option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF)
mark_as_advanced(WITH_HEADLESS)
+option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON)
+mark_as_advanced(WITH_AUDASPACE)
+
+
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -130,6 +142,7 @@
# Modifiers
option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke 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)
@@ -143,6 +156,7 @@
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
@@ -166,6 +180,7 @@
option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
# Misc
+option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
@@ -206,6 +221,10 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER)
+ message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
+endif()
+
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
@@ -214,6 +233,10 @@
message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
endif()
+if(NOT WITH_SDL AND WITH_GHOST_SDL)
+ message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+endif()
+
if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
endif()
@@ -435,10 +458,23 @@
endif()
endif()
+ if (WITH_INPUT_NDOF)
+ find_package(Spacenav)
+ if(NOT SPACENAV_FOUND)
+ set(WITH_INPUT_NDOF OFF)
+ endif()
+
+ # use generic names within blenders buildsystem.
+ if(SPACENAV_FOUND)
+ set(NDOF_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIRS})
+ set(NDOF_LIBRARIES ${SPACENAV_LIBRARIES})
+ endif()
+ endif()
+
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if(NOT WITH_HEADLESS)
+ if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
@@ -713,13 +749,17 @@
endif()
if(WITH_PYTHON)
- set(PYTHON_VERSION 3.2)
- set(PYTHON_INCLUDE_DIRS "${LIBDIR}/python/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARIES ${LIBDIR}/python/lib/python32.lib)
+ # normally cached but not since we include them with blender
+ set(PYTHON_VERSION 3.2) # CACHE STRING)
+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
+ set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
+
+ # uncached vars
+ set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+ set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
- set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib\;msvcmrt.lib\;msvcurt.lib\;msvcrtd.lib ")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
@@ -728,7 +768,7 @@
set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
endif()
- set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib\;libc.lib")
+ set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
else()
# keep GCC spesific stuff here
@@ -794,11 +834,8 @@
if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/gcc/openexr)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-
- # TODO, gives linking errors, force off
- set(WITH_IMAGE_OPENEXR OFF)
endif()
if(WITH_IMAGE_TIFF)
@@ -819,12 +856,14 @@
endif()
if(WITH_PYTHON)
- set(PYTHON ${LIBDIR}/python)
- set(PYTHON_VERSION 3.2)
- set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARIES ${PYTHON}/lib/python32mw.lib)
- set(PYTHON_LIBPATH ${PYTHON}/lib)
+ # normally cached but not since we include them with blender
+ set(PYTHON_VERSION 3.2) # CACHE STRING)
+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
+ set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32mw.lib") # CACHE FILEPATH)
+
+ # uncached vars
+ set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+ set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
set(PLATFORM_LINKFLAGS "--stack,2097152")
@@ -875,27 +914,20 @@
set(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib) # TODO, deprecate
endif()
- set(PYTHON_VERSION 3.2)
-
- if(PYTHON_VERSION MATCHES 3.2)
+ if(WITH_PYTHON)
# we use precompiled libraries for py 3.2 and up by default
- set(PYTHON ${LIBDIR}/python)
- set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
- set(PYTHON_LIBRARIES python${PYTHON_VERSION})
- set(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
+ # normally cached but not since we include them with blender
+ set(PYTHON_VERSION 3.2)
+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
+ # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
+ set(PYTHON_LIBRARY python${PYTHON_VERSION})
+ set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
- else()
- # otherwise, use custom system framework
- set(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
- set(PYTHON_VERSION 3.2)
- set(PYTHON_INCLUDE_DIRS "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
- set(PYTHON_LIBRARIES "")
- set(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config)
- set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
+ # uncached vars
+ set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+ set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
if(WITH_INTERNATIONAL)
@@ -946,7 +978,17 @@
set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
- set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ find_library(SYSTEMSTUBS_LIBRARY
+ NAMES
+ SystemStubs
+ PATHS
+ )
+ mark_as_advanced(SYSTEMSTUBS_LIBRARY)
+ if(SYSTEMSTUBS_LIBRARY)
+ set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ else()
+ set(PLATFORM_LINKLIBS stdc++)
+ endif()
if(WITH_COCOA)
set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
@@ -961,9 +1003,24 @@
elseif(WITH_CODEC_QUICKTIME)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
endif()
+
+ # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
+ # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+ if(WITH_INPUT_NDOF)
+ # This thread it *should* work and check the framework - campbell
+ # http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+ find_library(3D_CONNEXION_CLIENT_LIBRARY
+ NAMES 3DconnexionClient
+ )
+ if(NOT 3D_CONNEXION_CLIENT_LIBRARY)
+ set(WITH_INPUT_NDOF OFF)
+ endif()
+ endif()
+
else()
set(PLATFORM_CFLAGS "-pipe -funsigned-char")
set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+ set(WITH_INPUT_NDOF OFF) # unsupported
endif()
if(WITH_OPENCOLLADA)
@@ -1003,6 +1060,10 @@
set(TIFF_LIBPATH ${TIFF}/lib)
endif()
+ if (WITH_INPUT_NDOF)
+ # linker needs "-weak_framework 3DconnexionClient"
+ endif()
+
set(EXETYPE MACOSX_BUNDLE)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list