[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22357] branches/itasc: svn merge -r 22114 :22347 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Mon Aug 10 23:47:48 CEST 2009
Revision: 22357
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22357
Author: ben2610
Date: 2009-08-10 23:47:46 +0200 (Mon, 10 Aug 2009)
Log Message:
-----------
svn merge -r 22114:22347 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/CMake/macros.cmake
branches/itasc/CMakeLists.txt
branches/itasc/SConstruct
branches/itasc/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/itasc/blenderplayer/CMakeLists.txt
branches/itasc/config/darwin-config.py
branches/itasc/config/irix6-config.py
branches/itasc/config/linux2-config.py
branches/itasc/config/linuxcross-config.py
branches/itasc/config/openbsd3-config.py
branches/itasc/config/sunos5-config.py
branches/itasc/config/win32-mingw-config.py
branches/itasc/config/win32-vc-config.py
branches/itasc/config/win64-vc-config.py
branches/itasc/extern/ffmpeg/SConscript
branches/itasc/intern/CMakeLists.txt
branches/itasc/intern/Makefile
branches/itasc/intern/SConscript
branches/itasc/intern/ghost/intern/GHOST_EventManager.cpp
branches/itasc/intern/ghost/intern/GHOST_SystemX11.cpp
branches/itasc/intern/ghost/intern/GHOST_SystemX11.h
branches/itasc/intern/ghost/intern/GHOST_WindowManager.cpp
branches/itasc/intern/ghost/intern/GHOST_WindowX11.cpp
branches/itasc/intern/smoke/CMakeLists.txt
branches/itasc/intern/smoke/SConscript
branches/itasc/intern/smoke/extern/smoke_API.h
branches/itasc/intern/smoke/intern/FFT_NOISE.h
branches/itasc/intern/smoke/intern/FLUID_3D.cpp
branches/itasc/intern/smoke/intern/FLUID_3D.h
branches/itasc/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/itasc/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/itasc/intern/smoke/intern/WAVELET_NOISE.h
branches/itasc/intern/smoke/intern/WTURBULENCE.cpp
branches/itasc/intern/smoke/intern/WTURBULENCE.h
branches/itasc/intern/smoke/intern/smoke_API.cpp
branches/itasc/make/example_scripts/linux_nanmakefiles.sh
branches/itasc/make/example_scripts/sunos_nanmakefiles.sh
branches/itasc/po/ja.po
branches/itasc/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/itasc/projectfiles_vc9/blender/blender.sln
branches/itasc/projectfiles_vc9/blender/blender.vcproj
branches/itasc/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/itasc/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/itasc/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/itasc/projectfiles_vc9/blender/loader/BLO_loader.vcproj
branches/itasc/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/itasc/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
branches/itasc/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/itasc/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
branches/itasc/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/itasc/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj
branches/itasc/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
branches/itasc/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/itasc/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/itasc/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
branches/itasc/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
branches/itasc/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/itasc/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
branches/itasc/release/Makefile
branches/itasc/release/io/engine_render_pov.py
branches/itasc/release/scripts/export_map.py
branches/itasc/release/scripts/md2_export.py
branches/itasc/release/scripts/textplugin_convert_ge.py
branches/itasc/release/ui/bpy_ops.py
branches/itasc/release/ui/buttons_data_camera.py
branches/itasc/release/ui/buttons_data_mesh.py
branches/itasc/release/ui/buttons_data_metaball.py
branches/itasc/release/ui/buttons_data_modifier.py
branches/itasc/release/ui/buttons_game.py
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/buttons_object_constraint.py
branches/itasc/release/ui/buttons_physics_cloth.py
branches/itasc/release/ui/buttons_physics_fluid.py
branches/itasc/release/ui/buttons_physics_softbody.py
branches/itasc/release/ui/buttons_scene.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/buttons_world.py
branches/itasc/release/ui/space_console.py
branches/itasc/release/ui/space_image.py
branches/itasc/release/ui/space_info.py
branches/itasc/release/ui/space_text.py
branches/itasc/release/ui/space_view3d.py
branches/itasc/release/ui/space_view3d_toolbar.py
branches/itasc/source/Makefile
branches/itasc/source/blender/blenfont/BLF_api.h
branches/itasc/source/blender/blenfont/intern/blf.c
branches/itasc/source/blender/blenfont/intern/blf_font.c
branches/itasc/source/blender/blenfont/intern/blf_glyph.c
branches/itasc/source/blender/blenfont/intern/blf_internal_types.h
branches/itasc/source/blender/blenkernel/BKE_global.h
branches/itasc/source/blender/blenkernel/BKE_library.h
branches/itasc/source/blender/blenkernel/BKE_mball.h
branches/itasc/source/blender/blenkernel/BKE_nla.h
branches/itasc/source/blender/blenkernel/BKE_packedFile.h
branches/itasc/source/blender/blenkernel/BKE_sculpt.h
branches/itasc/source/blender/blenkernel/BKE_sequence.h
branches/itasc/source/blender/blenkernel/BKE_smoke.h
branches/itasc/source/blender/blenkernel/BKE_softbody.h
branches/itasc/source/blender/blenkernel/BKE_sound.h
branches/itasc/source/blender/blenkernel/BKE_writeavi.h
branches/itasc/source/blender/blenkernel/BKE_writeffmpeg.h
branches/itasc/source/blender/blenkernel/BKE_writeframeserver.h
branches/itasc/source/blender/blenkernel/CMakeLists.txt
branches/itasc/source/blender/blenkernel/SConscript
branches/itasc/source/blender/blenkernel/intern/Makefile
branches/itasc/source/blender/blenkernel/intern/anim_sys.c
branches/itasc/source/blender/blenkernel/intern/armature.c
branches/itasc/source/blender/blenkernel/intern/blender.c
branches/itasc/source/blender/blenkernel/intern/fcurve.c
branches/itasc/source/blender/blenkernel/intern/ipo.c
branches/itasc/source/blender/blenkernel/intern/key.c
branches/itasc/source/blender/blenkernel/intern/library.c
branches/itasc/source/blender/blenkernel/intern/mball.c
branches/itasc/source/blender/blenkernel/intern/modifier.c
branches/itasc/source/blender/blenkernel/intern/nla.c
branches/itasc/source/blender/blenkernel/intern/object.c
branches/itasc/source/blender/blenkernel/intern/packedFile.c
branches/itasc/source/blender/blenkernel/intern/pointcache.c
branches/itasc/source/blender/blenkernel/intern/sca.c
branches/itasc/source/blender/blenkernel/intern/scene.c
branches/itasc/source/blender/blenkernel/intern/sequence.c
branches/itasc/source/blender/blenkernel/intern/smoke.c
branches/itasc/source/blender/blenkernel/intern/softbody.c
branches/itasc/source/blender/blenkernel/intern/sound.c
branches/itasc/source/blender/blenkernel/intern/writeavi.c
branches/itasc/source/blender/blenkernel/intern/writeffmpeg.c
branches/itasc/source/blender/blenkernel/intern/writeframeserver.c
branches/itasc/source/blender/blenlib/BLI_vfontdata.h
branches/itasc/source/blender/blenlib/intern/bpath.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/blenloader/intern/writefile.c
branches/itasc/source/blender/editors/CMakeLists.txt
branches/itasc/source/blender/editors/animation/anim_channels.c
branches/itasc/source/blender/editors/animation/anim_filter.c
branches/itasc/source/blender/editors/animation/anim_ops.c
branches/itasc/source/blender/editors/animation/keyingsets.c
branches/itasc/source/blender/editors/armature/editarmature_sketch.c
branches/itasc/source/blender/editors/include/ED_anim_api.h
branches/itasc/source/blender/editors/interface/Makefile
branches/itasc/source/blender/editors/interface/SConscript
branches/itasc/source/blender/editors/interface/interface.c
branches/itasc/source/blender/editors/interface/interface_style.c
branches/itasc/source/blender/editors/interface/interface_templates.c
branches/itasc/source/blender/editors/mesh/editmesh.c
branches/itasc/source/blender/editors/mesh/editmesh_mods.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/physics/ed_pointcache.c
branches/itasc/source/blender/editors/screen/CMakeLists.txt
branches/itasc/source/blender/editors/screen/screen_edit.c
branches/itasc/source/blender/editors/screen/screen_ops.c
branches/itasc/source/blender/editors/screen/screendump.c
branches/itasc/source/blender/editors/sculpt_paint/sculpt.c
branches/itasc/source/blender/editors/space_action/action_draw.c
branches/itasc/source/blender/editors/space_action/action_header.c
branches/itasc/source/blender/editors/space_buttons/buttons_context.c
branches/itasc/source/blender/editors/space_file/filelist.c
branches/itasc/source/blender/editors/space_graph/graph_draw.c
branches/itasc/source/blender/editors/space_graph/graph_header.c
branches/itasc/source/blender/editors/space_graph/space_graph.c
branches/itasc/source/blender/editors/space_logic/logic_window.c
branches/itasc/source/blender/editors/space_nla/nla_buttons.c
branches/itasc/source/blender/editors/space_nla/nla_channels.c
branches/itasc/source/blender/editors/space_nla/nla_draw.c
branches/itasc/source/blender/editors/space_nla/nla_header.c
branches/itasc/source/blender/editors/space_outliner/outliner.c
branches/itasc/source/blender/editors/space_sequencer/Makefile
branches/itasc/source/blender/editors/space_sequencer/SConscript
branches/itasc/source/blender/editors/space_sequencer/sequencer_add.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_draw.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_edit.c
branches/itasc/source/blender/editors/space_sequencer/sequencer_select.c
branches/itasc/source/blender/editors/space_time/time_header.c
branches/itasc/source/blender/editors/space_view3d/drawobject.c
branches/itasc/source/blender/editors/space_view3d/view3d_buttons.c
branches/itasc/source/blender/editors/transform/transform_generics.c
branches/itasc/source/blender/editors/util/undo.c
branches/itasc/source/blender/imbuf/intern/targa.c
branches/itasc/source/blender/makesdna/DNA_action_types.h
branches/itasc/source/blender/makesdna/DNA_actuator_types.h
branches/itasc/source/blender/makesdna/DNA_anim_types.h
branches/itasc/source/blender/makesdna/DNA_brush_types.h
branches/itasc/source/blender/makesdna/DNA_material_types.h
branches/itasc/source/blender/makesdna/DNA_mesh_types.h
branches/itasc/source/blender/makesdna/DNA_meta_types.h
branches/itasc/source/blender/makesdna/DNA_scene_types.h
branches/itasc/source/blender/makesdna/DNA_sequence_types.h
branches/itasc/source/blender/makesdna/DNA_smoke_types.h
branches/itasc/source/blender/makesdna/DNA_sound_types.h
branches/itasc/source/blender/makesdna/DNA_texture_types.h
branches/itasc/source/blender/makesdna/DNA_userdef_types.h
branches/itasc/source/blender/makesdna/DNA_world_types.h
branches/itasc/source/blender/makesdna/intern/makesdna.c
branches/itasc/source/blender/makesrna/intern/CMakeLists.txt
branches/itasc/source/blender/makesrna/intern/SConscript
branches/itasc/source/blender/makesrna/intern/rna_actuator.c
branches/itasc/source/blender/makesrna/intern/rna_animation.c
branches/itasc/source/blender/makesrna/intern/rna_brush.c
branches/itasc/source/blender/makesrna/intern/rna_constraint.c
branches/itasc/source/blender/makesrna/intern/rna_curve.c
branches/itasc/source/blender/makesrna/intern/rna_define.c
branches/itasc/source/blender/makesrna/intern/rna_internal.h
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_mesh.c
branches/itasc/source/blender/makesrna/intern/rna_meta.c
branches/itasc/source/blender/makesrna/intern/rna_modifier.c
branches/itasc/source/blender/makesrna/intern/rna_object.c
branches/itasc/source/blender/makesrna/intern/rna_object_force.c
branches/itasc/source/blender/makesrna/intern/rna_pose.c
branches/itasc/source/blender/makesrna/intern/rna_sequence.c
branches/itasc/source/blender/makesrna/intern/rna_smoke.c
branches/itasc/source/blender/makesrna/intern/rna_sound.c
branches/itasc/source/blender/makesrna/intern/rna_texture.c
branches/itasc/source/blender/makesrna/intern/rna_userdef.c
branches/itasc/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/itasc/source/blender/python/BPY_extern.h
branches/itasc/source/blender/python/generic/BGL.c
branches/itasc/source/blender/python/generic/BGL.h
branches/itasc/source/blender/python/generic/Geometry.c
branches/itasc/source/blender/python/generic/Geometry.h
branches/itasc/source/blender/python/generic/Makefile
branches/itasc/source/blender/python/generic/Mathutils.c
branches/itasc/source/blender/python/generic/Mathutils.h
branches/itasc/source/blender/python/generic/bpy_internal_import.c
branches/itasc/source/blender/python/generic/bpy_internal_import.h
branches/itasc/source/blender/python/generic/euler.c
branches/itasc/source/blender/python/generic/euler.h
branches/itasc/source/blender/python/generic/matrix.c
branches/itasc/source/blender/python/generic/quat.c
branches/itasc/source/blender/python/generic/quat.h
branches/itasc/source/blender/python/generic/vector.c
branches/itasc/source/blender/python/generic/vector.h
branches/itasc/source/blender/python/intern/Makefile
branches/itasc/source/blender/python/intern/bpy_interface.c
branches/itasc/source/blender/python/intern/bpy_operator.c
branches/itasc/source/blender/python/intern/bpy_operator_wrap.c
branches/itasc/source/blender/python/intern/bpy_rna.c
branches/itasc/source/blender/python/intern/bpy_ui.c
branches/itasc/source/blender/python/intern/bpy_util.c
branches/itasc/source/blender/python/intern/bpy_util.h
branches/itasc/source/blender/render/intern/source/pipeline.c
branches/itasc/source/blender/windowmanager/CMakeLists.txt
branches/itasc/source/blender/windowmanager/intern/Makefile
branches/itasc/source/blender/windowmanager/intern/wm.c
branches/itasc/source/blender/windowmanager/intern/wm_init_exit.c
branches/itasc/source/blender/windowmanager/intern/wm_window.c
branches/itasc/source/blender/windowmanager/wm_window.h
branches/itasc/source/creator/CMakeLists.txt
branches/itasc/source/creator/creator.c
branches/itasc/source/darwin/Makefile
branches/itasc/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/itasc/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/itasc/source/gameengine/BlenderRoutines/Makefile
branches/itasc/source/gameengine/BlenderRoutines/SConscript
branches/itasc/source/gameengine/Converter/BL_ActionActuator.cpp
branches/itasc/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/itasc/source/gameengine/Converter/CMakeLists.txt
branches/itasc/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/itasc/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/itasc/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/itasc/source/gameengine/Converter/Makefile
branches/itasc/source/gameengine/Converter/SConscript
branches/itasc/source/gameengine/Expressions/ListValue.cpp
branches/itasc/source/gameengine/Expressions/PyObjectPlus.cpp
branches/itasc/source/gameengine/Expressions/PyObjectPlus.h
branches/itasc/source/gameengine/Expressions/Value.cpp
branches/itasc/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_IController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/itasc/source/gameengine/GameLogic/SCA_IObject.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_NORController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_ORController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/itasc/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/itasc/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/itasc/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/itasc/source/gameengine/GameLogic/SCA_XORController.cpp
branches/itasc/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/itasc/source/gameengine/GamePlayer/common/Makefile
branches/itasc/source/gameengine/GamePlayer/common/SConscript
branches/itasc/source/gameengine/GamePlayer/common/unix/Makefile
branches/itasc/source/gameengine/GamePlayer/common/windows/Makefile
branches/itasc/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/itasc/source/gameengine/GamePlayer/ghost/Makefile
branches/itasc/source/gameengine/GamePlayer/ghost/SConscript
branches/itasc/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/itasc/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp
branches/itasc/source/gameengine/Ketsji/BL_Shader.cpp
branches/itasc/source/gameengine/Ketsji/CMakeLists.txt
branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/itasc/source/gameengine/Ketsji/KX_Camera.cpp
branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameObject.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameObject.h
branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/itasc/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/itasc/source/gameengine/Ketsji/KX_Light.cpp
branches/itasc/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/itasc/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/itasc/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/itasc/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/itasc/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/itasc/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_Scene.cpp
branches/itasc/source/gameengine/Ketsji/KX_Scene.h
branches/itasc/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.h
branches/itasc/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/itasc/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/itasc/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/itasc/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/itasc/source/gameengine/Ketsji/Makefile
branches/itasc/source/gameengine/Ketsji/SConscript
branches/itasc/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/itasc/source/gameengine/Physics/Bullet/Makefile
branches/itasc/source/gameengine/Physics/Bullet/SConscript
branches/itasc/source/gameengine/Physics/Dummy/Makefile
branches/itasc/source/gameengine/Physics/common/Makefile
branches/itasc/source/gameengine/PyDoc/GameLogic.py
branches/itasc/source/gameengine/PyDoc/GameTypes.py
branches/itasc/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/itasc/source/gameengine/VideoTexture/CMakeLists.txt
branches/itasc/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/itasc/source/gameengine/VideoTexture/FilterColor.cpp
branches/itasc/source/gameengine/VideoTexture/FilterNormal.cpp
branches/itasc/source/gameengine/VideoTexture/FilterSource.cpp
branches/itasc/source/gameengine/VideoTexture/ImageBuff.cpp
branches/itasc/source/gameengine/VideoTexture/ImageMix.cpp
branches/itasc/source/gameengine/VideoTexture/ImageRender.cpp
branches/itasc/source/gameengine/VideoTexture/ImageViewport.cpp
branches/itasc/source/gameengine/VideoTexture/Makefile
branches/itasc/source/gameengine/VideoTexture/SConscript
branches/itasc/source/gameengine/VideoTexture/Texture.cpp
branches/itasc/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/itasc/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/itasc/source/kernel/gen_system/SYS_SingletonSystem.cpp
branches/itasc/source/kernel/gen_system/SYS_SingletonSystem.h
branches/itasc/source/nan_compile.mk
branches/itasc/source/nan_definitions.mk
branches/itasc/source/nan_link.mk
branches/itasc/tools/Blender.py
branches/itasc/tools/btools.py
Added Paths:
-----------
branches/itasc/intern/audaspace/
branches/itasc/intern/audaspace/AUD_C-API.h
branches/itasc/intern/audaspace/CMakeLists.txt
branches/itasc/intern/audaspace/COPYING
branches/itasc/intern/audaspace/COPYING.LESSER
branches/itasc/intern/audaspace/FX/
branches/itasc/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_DelayFactory.h
branches/itasc/intern/audaspace/FX/AUD_DelayReader.cpp
branches/itasc/intern/audaspace/FX/AUD_DelayReader.h
branches/itasc/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/itasc/intern/audaspace/FX/AUD_DoubleReader.h
branches/itasc/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_EffectFactory.h
branches/itasc/intern/audaspace/FX/AUD_EffectReader.cpp
branches/itasc/intern/audaspace/FX/AUD_EffectReader.h
branches/itasc/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_FaderFactory.h
branches/itasc/intern/audaspace/FX/AUD_FaderReader.cpp
branches/itasc/intern/audaspace/FX/AUD_FaderReader.h
branches/itasc/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_LimiterFactory.h
branches/itasc/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/itasc/intern/audaspace/FX/AUD_LimiterReader.h
branches/itasc/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_LoopFactory.h
branches/itasc/intern/audaspace/FX/AUD_LoopReader.cpp
branches/itasc/intern/audaspace/FX/AUD_LoopReader.h
branches/itasc/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_PingPongFactory.h
branches/itasc/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_PitchFactory.h
branches/itasc/intern/audaspace/FX/AUD_PitchReader.cpp
branches/itasc/intern/audaspace/FX/AUD_PitchReader.h
branches/itasc/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_ReverseFactory.h
branches/itasc/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/itasc/intern/audaspace/FX/AUD_ReverseReader.h
branches/itasc/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_VolumeFactory.h
branches/itasc/intern/audaspace/FX/AUD_VolumeReader.cpp
branches/itasc/intern/audaspace/FX/AUD_VolumeReader.h
branches/itasc/intern/audaspace/FX/Makefile
branches/itasc/intern/audaspace/Makefile
branches/itasc/intern/audaspace/OpenAL/
branches/itasc/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/itasc/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/itasc/intern/audaspace/SConscript
branches/itasc/intern/audaspace/SDL/
branches/itasc/intern/audaspace/SDL/AUD_SDLDevice.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLDevice.h
branches/itasc/intern/audaspace/SDL/AUD_SDLMixer.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLMixer.h
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerFactory.h
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerReader.h
branches/itasc/intern/audaspace/SDL/Makefile
branches/itasc/intern/audaspace/SRC/
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleFactory.h
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleReader.h
branches/itasc/intern/audaspace/SRC/Makefile
branches/itasc/intern/audaspace/ffmpeg/
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/itasc/intern/audaspace/ffmpeg/Makefile
branches/itasc/intern/audaspace/intern/
branches/itasc/intern/audaspace/intern/AUD_Buffer.cpp
branches/itasc/intern/audaspace/intern/AUD_Buffer.h
branches/itasc/intern/audaspace/intern/AUD_BufferReader.cpp
branches/itasc/intern/audaspace/intern/AUD_BufferReader.h
branches/itasc/intern/audaspace/intern/AUD_C-API.cpp
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/itasc/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_ConverterFactory.h
branches/itasc/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/itasc/intern/audaspace/intern/AUD_ConverterFunctions.h
branches/itasc/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/itasc/intern/audaspace/intern/AUD_ConverterReader.h
branches/itasc/intern/audaspace/intern/AUD_FloatMixer.cpp
branches/itasc/intern/audaspace/intern/AUD_FloatMixer.h
branches/itasc/intern/audaspace/intern/AUD_I3DDevice.h
branches/itasc/intern/audaspace/intern/AUD_IDevice.h
branches/itasc/intern/audaspace/intern/AUD_IFactory.h
branches/itasc/intern/audaspace/intern/AUD_IMixer.h
branches/itasc/intern/audaspace/intern/AUD_IReader.h
branches/itasc/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_MixerFactory.h
branches/itasc/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/itasc/intern/audaspace/intern/AUD_NULLDevice.h
branches/itasc/intern/audaspace/intern/AUD_ReadDevice.cpp
branches/itasc/intern/audaspace/intern/AUD_ReadDevice.h
branches/itasc/intern/audaspace/intern/AUD_Reference.h
branches/itasc/intern/audaspace/intern/AUD_ResampleFactory.h
branches/itasc/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_SinusFactory.h
branches/itasc/intern/audaspace/intern/AUD_SinusReader.cpp
branches/itasc/intern/audaspace/intern/AUD_SinusReader.h
branches/itasc/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/itasc/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/itasc/intern/audaspace/intern/AUD_SourceCaps.h
branches/itasc/intern/audaspace/intern/AUD_Space.h
branches/itasc/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/itasc/intern/audaspace/intern/Makefile
branches/itasc/intern/audaspace/make/
branches/itasc/intern/audaspace/make/msvc_9_0/
branches/itasc/intern/audaspace/make/msvc_9_0/audaspace.vcproj
branches/itasc/release/ui/buttons_physics_smoke.py
Removed Paths:
-------------
branches/itasc/extern/fftw/
branches/itasc/intern/SoundSystem/
branches/itasc/intern/audaspace/AUD_C-API.h
branches/itasc/intern/audaspace/CMakeLists.txt
branches/itasc/intern/audaspace/COPYING
branches/itasc/intern/audaspace/COPYING.LESSER
branches/itasc/intern/audaspace/FX/
branches/itasc/intern/audaspace/FX/AUD_DelayFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_DelayFactory.h
branches/itasc/intern/audaspace/FX/AUD_DelayReader.cpp
branches/itasc/intern/audaspace/FX/AUD_DelayReader.h
branches/itasc/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/itasc/intern/audaspace/FX/AUD_DoubleReader.h
branches/itasc/intern/audaspace/FX/AUD_EffectFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_EffectFactory.h
branches/itasc/intern/audaspace/FX/AUD_EffectReader.cpp
branches/itasc/intern/audaspace/FX/AUD_EffectReader.h
branches/itasc/intern/audaspace/FX/AUD_FaderFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_FaderFactory.h
branches/itasc/intern/audaspace/FX/AUD_FaderReader.cpp
branches/itasc/intern/audaspace/FX/AUD_FaderReader.h
branches/itasc/intern/audaspace/FX/AUD_LimiterFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_LimiterFactory.h
branches/itasc/intern/audaspace/FX/AUD_LimiterReader.cpp
branches/itasc/intern/audaspace/FX/AUD_LimiterReader.h
branches/itasc/intern/audaspace/FX/AUD_LoopFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_LoopFactory.h
branches/itasc/intern/audaspace/FX/AUD_LoopReader.cpp
branches/itasc/intern/audaspace/FX/AUD_LoopReader.h
branches/itasc/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_PingPongFactory.h
branches/itasc/intern/audaspace/FX/AUD_PitchFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_PitchFactory.h
branches/itasc/intern/audaspace/FX/AUD_PitchReader.cpp
branches/itasc/intern/audaspace/FX/AUD_PitchReader.h
branches/itasc/intern/audaspace/FX/AUD_ReverseFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_ReverseFactory.h
branches/itasc/intern/audaspace/FX/AUD_ReverseReader.cpp
branches/itasc/intern/audaspace/FX/AUD_ReverseReader.h
branches/itasc/intern/audaspace/FX/AUD_VolumeFactory.cpp
branches/itasc/intern/audaspace/FX/AUD_VolumeFactory.h
branches/itasc/intern/audaspace/FX/AUD_VolumeReader.cpp
branches/itasc/intern/audaspace/FX/AUD_VolumeReader.h
branches/itasc/intern/audaspace/FX/Makefile
branches/itasc/intern/audaspace/Makefile
branches/itasc/intern/audaspace/OpenAL/
branches/itasc/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/itasc/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/itasc/intern/audaspace/SConscript
branches/itasc/intern/audaspace/SDL/
branches/itasc/intern/audaspace/SDL/AUD_SDLDevice.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLDevice.h
branches/itasc/intern/audaspace/SDL/AUD_SDLMixer.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLMixer.h
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerFactory.h
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
branches/itasc/intern/audaspace/SDL/AUD_SDLMixerReader.h
branches/itasc/intern/audaspace/SDL/Makefile
branches/itasc/intern/audaspace/SRC/
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleFactory.h
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
branches/itasc/intern/audaspace/SRC/AUD_SRCResampleReader.h
branches/itasc/intern/audaspace/SRC/Makefile
branches/itasc/intern/audaspace/ffmpeg/
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/itasc/intern/audaspace/ffmpeg/Makefile
branches/itasc/intern/audaspace/intern/
branches/itasc/intern/audaspace/intern/AUD_Buffer.cpp
branches/itasc/intern/audaspace/intern/AUD_Buffer.h
branches/itasc/intern/audaspace/intern/AUD_BufferReader.cpp
branches/itasc/intern/audaspace/intern/AUD_BufferReader.h
branches/itasc/intern/audaspace/intern/AUD_C-API.cpp
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperFactory.h
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/itasc/intern/audaspace/intern/AUD_ChannelMapperReader.h
branches/itasc/intern/audaspace/intern/AUD_ConverterFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_ConverterFactory.h
branches/itasc/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/itasc/intern/audaspace/intern/AUD_ConverterFunctions.h
branches/itasc/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/itasc/intern/audaspace/intern/AUD_ConverterReader.h
branches/itasc/intern/audaspace/intern/AUD_FloatMixer.cpp
branches/itasc/intern/audaspace/intern/AUD_FloatMixer.h
branches/itasc/intern/audaspace/intern/AUD_I3DDevice.h
branches/itasc/intern/audaspace/intern/AUD_IDevice.h
branches/itasc/intern/audaspace/intern/AUD_IFactory.h
branches/itasc/intern/audaspace/intern/AUD_IMixer.h
branches/itasc/intern/audaspace/intern/AUD_IReader.h
branches/itasc/intern/audaspace/intern/AUD_MixerFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_MixerFactory.h
branches/itasc/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/itasc/intern/audaspace/intern/AUD_NULLDevice.h
branches/itasc/intern/audaspace/intern/AUD_ReadDevice.cpp
branches/itasc/intern/audaspace/intern/AUD_ReadDevice.h
branches/itasc/intern/audaspace/intern/AUD_Reference.h
branches/itasc/intern/audaspace/intern/AUD_ResampleFactory.h
branches/itasc/intern/audaspace/intern/AUD_SinusFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_SinusFactory.h
branches/itasc/intern/audaspace/intern/AUD_SinusReader.cpp
branches/itasc/intern/audaspace/intern/AUD_SinusReader.h
branches/itasc/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/itasc/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/itasc/intern/audaspace/intern/AUD_SourceCaps.h
branches/itasc/intern/audaspace/intern/AUD_Space.h
branches/itasc/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/itasc/intern/audaspace/intern/AUD_StreamBufferFactory.h
branches/itasc/intern/audaspace/intern/Makefile
branches/itasc/intern/audaspace/make/
branches/itasc/intern/audaspace/make/msvc_9_0/
branches/itasc/intern/audaspace/make/msvc_9_0/audaspace.vcproj
branches/itasc/release/windows/extra/Python24.zip
branches/itasc/release/windows/extra/python25.zip
branches/itasc/release/windows/extra/python26.zip
branches/itasc/release/windows/extra/python30.zip
branches/itasc/release/windows/extra/python31.zip
branches/itasc/release/windows/extra/zlib.pyd
branches/itasc/source/blender/blenlib/intern/psfont.c
branches/itasc/source/blender/python/intern/bpy_compat.h
branches/itasc/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/itasc/source/gameengine/Ketsji/KX_CDActuator.h
Property Changed:
----------------
branches/itasc/intern/smoke/extern/smoke_API.h
branches/itasc/intern/smoke/intern/FLUID_3D.cpp
branches/itasc/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/itasc/intern/smoke/intern/WAVELET_NOISE.h
branches/itasc/intern/smoke/intern/smoke_API.cpp
branches/itasc/source/blender/blenkernel/intern/smoke.c
branches/itasc/source/blender/makesrna/SConscript
Modified: branches/itasc/CMake/macros.cmake
===================================================================
--- branches/itasc/CMake/macros.cmake 2009-08-10 21:37:16 UTC (rev 22356)
+++ branches/itasc/CMake/macros.cmake 2009-08-10 21:47:46 UTC (rev 22357)
@@ -43,13 +43,16 @@
CMAKE_POLICY(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
- LINK_DIRECTORIES(${FREETYPE_LIBPATH})
+ LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
IF(WITH_INTERNATIONAL)
LINK_DIRECTORIES(${GETTEXT_LIBPATH})
ENDIF(WITH_INTERNATIONAL)
IF(WITH_OPENAL)
LINK_DIRECTORIES(${OPENAL_LIBPATH})
ENDIF(WITH_OPENAL)
+ IF(WITH_FFTW3)
+ LINK_DIRECTORIES(${FFTW3_LIBPATH})
+ ENDIF(WITH_FFTW3)
IF(WIN32)
LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -61,7 +64,7 @@
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
#TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
@@ -79,7 +82,7 @@
TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
- TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
Modified: branches/itasc/CMakeLists.txt
===================================================================
--- branches/itasc/CMakeLists.txt 2009-08-10 21:37:16 UTC (rev 22356)
+++ branches/itasc/CMakeLists.txt 2009-08-10 21:47:46 UTC (rev 22357)
@@ -68,6 +68,7 @@
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
+OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -156,7 +157,19 @@
SET(FFMPEG_INC ${FFMPEG}/include)
SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+
+ IF(WITH_FFTW3)
+ SET(FFTW3 /usr)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB fftw3)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ ENDIF(WITH_FFTW3)
+ SET(LIBSAMPLERATE /usr)
+ SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+ SET(LIBSAMPLERATE_LIB samplerate)
+ SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
@@ -196,20 +209,20 @@
ENDIF(CMAKE_CL_64)
SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_VERSION 2.6)
+ SET(PYTHON_VERSION 3.1)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
SET(PYTHON_BINARY python)
- SET(PYTHON_LIB python26)
+ SET(PYTHON_LIB python31)
SET(PYTHON_LIBPATH ${PYTHON}/lib)
IF(CMAKE_CL_64)
SET(WITH_OPENAL OFF)
ELSE(CMAKE_CL_64)
- #SET(WITH_OPENAL ON)
- SET(OPENAL ${LIBDIR}/openal)
- SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
- SET(OPENAL_LIB openal_static)
- SET(OPENAL_LIBPATH ${OPENAL}/lib)
+ #SET(WITH_OPENAL ON)
+ SET(OPENAL ${LIBDIR}/openal)
+ SET(OPENAL_INC ${OPENAL}/include)
+ SET(OPENAL_LIB wrap_oal)
+ SET(OPENAL_LIBPATH ${OPENAL}/lib)
ENDIF(CMAKE_CL_64)
IF(CMAKE_CL_64)
@@ -234,6 +247,13 @@
SET(ICONV_LIB iconv)
SET(ICONV_LIBPATH ${ICONV}/lib)
+ IF(WITH_FFTW3)
+ SET(FFTW3 ${LIBDIR}/fftw3)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB libfftw)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ ENDIF(WITH_FFTW3)
+
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC ${GETTEXT}/include)
IF(CMAKE_CL_64)
@@ -271,15 +291,16 @@
SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+ SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+ SET(LIBSAMPLERATE_LIB libsamplerate)
+ SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
IF(CMAKE_CL_64)
SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
ELSE(CMAKE_CL_64)
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
ENDIF(CMAKE_CL_64)
-
- IF(WITH_OPENAL)
- SET(LLIBS ${LLIBS} dxguid)
- ENDIF(WITH_OPENAL)
SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -367,6 +388,13 @@
SET(GETTEXT_INC "${GETTEXT}/include")
SET(GETTEXT_LIB intl iconv)
SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+
+ IF(WITH_FFTW3)
+ SET(FFTW3 ${LIBDIR}/fftw3)
+ SET(FFTW3_INC ${FFTW3}/include)
+ SET(FFTW3_LIB libfftw)
+ SET(FFTW3_LIBPATH ${FFTW3}/lib)
+ ENDIF(WITH_FFTW3)
SET(PNG_LIBRARIES png)
SET(JPEG_LIBRARY jpeg)
Modified: branches/itasc/SConstruct
===================================================================
--- branches/itasc/SConstruct 2009-08-10 21:37:16 UTC (rev 22356)
+++ branches/itasc/SConstruct 2009-08-10 21:47:46 UTC (rev 22357)
@@ -31,6 +31,7 @@
import platform as pltfrm
+# Need a better way to do this. Automagical maybe is not the best thing, maybe it is.
if pltfrm.architecture()[0] == '64bit':
bitness = 64
else:
@@ -573,8 +574,8 @@
if env['WITH_BF_PYTHON']:
ver = env["BF_PYTHON_VERSION"].replace(".", "")
- dllsources.append('#release/windows/extra/python' + ver + '.zip')
- dllsources.append('#release/windows/extra/zlib.pyd')
+ dllsources.append('${LCGDIR}/release/python' + ver + '.zip')
+ dllsources.append('${LCGDIR}/release/zlib.pyd')
if env['BF_DEBUG']:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
else:
@@ -584,6 +585,9 @@
pass # we link statically to iconv on win64
else:
dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
+ if env['WITH_BF_OPENAL']:
+ dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
+ dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
if env['WITH_BF_FFMPEG']:
dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll',
'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
Modified: branches/itasc/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/itasc/blenderplayer/CMakeLists.txt
===================================================================
--- branches/itasc/blenderplayer/CMakeLists.txt 2009-08-10 21:37:16 UTC (rev 22356)
+++ branches/itasc/blenderplayer/CMakeLists.txt 2009-08-10 21:47:46 UTC (rev 22357)
@@ -87,7 +87,6 @@
bf_scenegraph
bf_IK
bf_moto
- bf_soundsystem
bf_kernel
bf_nodes
bf_gpu
Modified: branches/itasc/config/darwin-config.py
===================================================================
--- branches/itasc/config/darwin-config.py 2009-08-10 21:37:16 UTC (rev 22356)
+++ branches/itasc/config/darwin-config.py 2009-08-10 21:47:46 UTC (rev 22357)
@@ -27,28 +27,34 @@
LCGDIR = '#../lib/darwin-8.x.i386'
LIBDIR = '${LCGDIR}'
+BF_PYTHON_VERSION = '3.1'
+
if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-elif MAC_CUR_VER=='10.4':
+else:
MAC_MIN_VERS = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
-else:
- MAC_MIN_VERS = '10.5'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-BF_FFMPEG = "#extern/ffmpeg"
-BF_FFMPEG_INC = '${BF_FFMPEG}'
-if USE_SDK==True:
- BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
-#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
+FFMPEG_PRECOMPILED = False
+if FFMPEG_PRECOMPILED:
+ # use precompiled ffmpeg in /lib
+ BF_FFMPEG = LIBDIR + '/ffmpeg'
+ BF_FFMPEG_INC = "#extern/ffmpeg"
+ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+ BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore'
+else:
+ # use ffmpeg in extern
+ BF_FFMPEG = "#extern/ffmpeg"
+ BF_FFMPEG_INC = '${BF_FFMPEG}'
+ if USE_SDK==True:
+ BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
+ BF_XVIDCORE_CONFIG = '--disable-assembly' # currently causes errors, even with yasm installed
+ BF_X264_CONFIG = '--disable-pthread'
-BF_PYTHON_VERSION = '3.1'
-
if BF_PYTHON_VERSION=='3.1':
# python 3.1 uses precompiled libraries in bf svn /lib by default
@@ -80,11 +86,6 @@
BF_QUIET = '1'
WITH_BF_OPENMP = '0'
-# Note : should be true, but openal simply dont work on intel
-if MAC_PROC == 'i386':
- WITH_BF_OPENAL = False
-else:
- WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
#BF_OPENAL = LIBDIR + '/openal'
@@ -106,6 +107,11 @@
WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -158,6 +164,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list