[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20308] branches/ge_dev: svn merge -r 19958:20307 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Benoit Bolsee
benoit.bolsee at online.be
Wed May 20 23:32:57 CEST 2009
Revision: 20308
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20308
Author: ben2610
Date: 2009-05-20 23:32:56 +0200 (Wed, 20 May 2009)
Log Message:
-----------
svn merge -r 19958:20307 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/ge_dev/CMake/macros.cmake
branches/ge_dev/CMakeLists.txt
branches/ge_dev/config/irix6-config.py
branches/ge_dev/config/linux2-config.py
branches/ge_dev/extern/CMakeLists.txt
branches/ge_dev/extern/bullet2/src/CMakeLists.txt
branches/ge_dev/extern/verse/CMakeLists.txt
branches/ge_dev/extern/verse/dist/CMakeLists.txt
branches/ge_dev/intern/CMakeLists.txt
branches/ge_dev/intern/SoundSystem/openal/SND_OpenALDevice.cpp
branches/ge_dev/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/ge_dev/intern/ghost/intern/GHOST_SystemCarbon.h
branches/ge_dev/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_dev/intern/ghost/intern/GHOST_SystemX11.h
branches/ge_dev/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/ge_dev/projectfiles_vc9/gameengine/scenegraph/SG_SceneGraph.vcproj
branches/ge_dev/release/scripts/3ds_export.py
branches/ge_dev/release/scripts/3ds_import.py
branches/ge_dev/release/scripts/DirectX8Exporter.py
branches/ge_dev/release/scripts/add_mesh_torus.py
branches/ge_dev/release/scripts/bpymodules/colladaImEx/collada.py
branches/ge_dev/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/ge_dev/release/scripts/bpymodules/colladaImEx/cutils.py
branches/ge_dev/release/scripts/bpymodules/colladaImEx/translator.py
branches/ge_dev/release/scripts/bpymodules/dxfLibrary.py
branches/ge_dev/release/scripts/envelope_symmetry.py
branches/ge_dev/release/scripts/export_dxf.py
branches/ge_dev/release/scripts/export_fbx.py
branches/ge_dev/release/scripts/export_obj.py
branches/ge_dev/release/scripts/help_bpy_api.py
branches/ge_dev/release/scripts/help_getting_started.py
branches/ge_dev/release/scripts/help_manual.py
branches/ge_dev/release/scripts/help_release_notes.py
branches/ge_dev/release/scripts/help_tutorials.py
branches/ge_dev/release/scripts/help_web_blender.py
branches/ge_dev/release/scripts/help_web_devcomm.py
branches/ge_dev/release/scripts/help_web_eshop.py
branches/ge_dev/release/scripts/help_web_usercomm.py
branches/ge_dev/release/scripts/import_obj.py
branches/ge_dev/release/scripts/import_web3d.py
branches/ge_dev/release/scripts/lightwave_export.py
branches/ge_dev/release/scripts/mesh_mirror_tool.py
branches/ge_dev/release/scripts/mesh_poly_reduce_grid.py
branches/ge_dev/release/scripts/object_cookie_cutter.py
branches/ge_dev/release/scripts/scripttemplate_gamelogic.py
branches/ge_dev/release/scripts/scripttemplate_gamelogic_basic.py
branches/ge_dev/release/scripts/vertexpaint_selfshadow_ao.py
branches/ge_dev/source/CMakeLists.txt
branches/ge_dev/source/Makefile
branches/ge_dev/source/blender/CMakeLists.txt
branches/ge_dev/source/blender/blenkernel/BKE_bad_level_calls.h
branches/ge_dev/source/blender/blenkernel/CMakeLists.txt
branches/ge_dev/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/ge_dev/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_dev/source/blender/blenkernel/intern/blender.c
branches/ge_dev/source/blender/blenkernel/intern/bmfont.c
branches/ge_dev/source/blender/blenkernel/intern/customdata.c
branches/ge_dev/source/blender/blenkernel/intern/displist.c
branches/ge_dev/source/blender/blenkernel/intern/exotic.c
branches/ge_dev/source/blender/blenkernel/intern/fluidsim.c
branches/ge_dev/source/blender/blenkernel/intern/font.c
branches/ge_dev/source/blender/blenkernel/intern/image.c
branches/ge_dev/source/blender/blenkernel/intern/mball.c
branches/ge_dev/source/blender/blenkernel/intern/object.c
branches/ge_dev/source/blender/blenkernel/intern/particle.c
branches/ge_dev/source/blender/blenkernel/intern/particle_system.c
branches/ge_dev/source/blender/blenkernel/intern/sca.c
branches/ge_dev/source/blender/blenkernel/intern/scene.c
branches/ge_dev/source/blender/blenlib/BLI_blenlib.h
branches/ge_dev/source/blender/blenlib/BLI_vfontdata.h
branches/ge_dev/source/blender/blenlib/intern/storage.c
branches/ge_dev/source/blender/blenlib/intern/util.c
branches/ge_dev/source/blender/blenloader/intern/readfile.c
branches/ge_dev/source/blender/gpu/GPU_material.h
branches/ge_dev/source/blender/gpu/intern/gpu_material.c
branches/ge_dev/source/blender/imbuf/intern/imageprocess.c
branches/ge_dev/source/blender/imbuf/intern/scaling.c
branches/ge_dev/source/blender/include/BIF_editfont.h
branches/ge_dev/source/blender/makesdna/CMakeLists.txt
branches/ge_dev/source/blender/makesdna/DNA_actuator_types.h
branches/ge_dev/source/blender/makesdna/DNA_controller_types.h
branches/ge_dev/source/blender/makesdna/DNA_object_force.h
branches/ge_dev/source/blender/makesdna/DNA_object_types.h
branches/ge_dev/source/blender/makesdna/DNA_scene_types.h
branches/ge_dev/source/blender/makesdna/DNA_sensor_types.h
branches/ge_dev/source/blender/makesdna/DNA_space_types.h
branches/ge_dev/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/ge_dev/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/ge_dev/source/blender/python/BPY_interface.c
branches/ge_dev/source/blender/python/SConscript
branches/ge_dev/source/blender/python/api2_2x/Blender.c
branches/ge_dev/source/blender/python/api2_2x/Draw.c
branches/ge_dev/source/blender/python/api2_2x/Geometry.c
branches/ge_dev/source/blender/python/api2_2x/Geometry.h
branches/ge_dev/source/blender/python/api2_2x/Mathutils.c
branches/ge_dev/source/blender/python/api2_2x/Mathutils.h
branches/ge_dev/source/blender/python/api2_2x/Modifier.c
branches/ge_dev/source/blender/python/api2_2x/Object.c
branches/ge_dev/source/blender/python/api2_2x/Particle.c
branches/ge_dev/source/blender/python/api2_2x/bpy_internal_import.c
branches/ge_dev/source/blender/python/api2_2x/bpy_internal_import.h
branches/ge_dev/source/blender/python/api2_2x/doc/Geometry.py
branches/ge_dev/source/blender/python/api2_2x/doc/Image.py
branches/ge_dev/source/blender/python/api2_2x/doc/Mathutils.py
branches/ge_dev/source/blender/python/api2_2x/doc/Modifier.py
branches/ge_dev/source/blender/python/api2_2x/doc/Particle.py
branches/ge_dev/source/blender/python/api2_2x/euler.c
branches/ge_dev/source/blender/python/api2_2x/euler.h
branches/ge_dev/source/blender/python/api2_2x/matrix.c
branches/ge_dev/source/blender/python/api2_2x/matrix.h
branches/ge_dev/source/blender/python/api2_2x/quat.c
branches/ge_dev/source/blender/python/api2_2x/quat.h
branches/ge_dev/source/blender/python/api2_2x/vector.c
branches/ge_dev/source/blender/render/intern/source/convertblender.c
branches/ge_dev/source/blender/render/intern/source/rayshade.c
branches/ge_dev/source/blender/render/intern/source/rendercore.c
branches/ge_dev/source/blender/render/intern/source/shadeoutput.c
branches/ge_dev/source/blender/render/intern/source/texture.c
branches/ge_dev/source/blender/src/buttons_logic.c
branches/ge_dev/source/blender/src/buttons_scene.c
branches/ge_dev/source/blender/src/buttons_shading.c
branches/ge_dev/source/blender/src/drawgpencil.c
branches/ge_dev/source/blender/src/drawview.c
branches/ge_dev/source/blender/src/editarmature.c
branches/ge_dev/source/blender/src/editarmature_sketch.c
branches/ge_dev/source/blender/src/editdeform.c
branches/ge_dev/source/blender/src/editfont.c
branches/ge_dev/source/blender/src/editmesh_tools.c
branches/ge_dev/source/blender/src/editnla.c
branches/ge_dev/source/blender/src/editnode.c
branches/ge_dev/source/blender/src/editobject.c
branches/ge_dev/source/blender/src/editseq.c
branches/ge_dev/source/blender/src/filelist.c
branches/ge_dev/source/blender/src/filesel.c
branches/ge_dev/source/blender/src/header_node.c
branches/ge_dev/source/blender/src/header_view3d.c
branches/ge_dev/source/blender/src/imagepaint.c
branches/ge_dev/source/blender/src/previewrender.c
branches/ge_dev/source/blender/src/reeb.c
branches/ge_dev/source/blender/src/space.c
branches/ge_dev/source/blender/src/toets.c
branches/ge_dev/source/blender/src/transform.c
branches/ge_dev/source/blender/src/transform_conversions.c
branches/ge_dev/source/creator/creator.c
branches/ge_dev/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ge_dev/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/ge_dev/source/gameengine/CMakeLists.txt
branches/ge_dev/source/gameengine/Converter/BL_ActionActuator.cpp
branches/ge_dev/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_dev/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/ge_dev/source/gameengine/Converter/BL_DeformableGameObject.h
branches/ge_dev/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/ge_dev/source/gameengine/Converter/BL_MeshDeformer.h
branches/ge_dev/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/ge_dev/source/gameengine/Converter/BL_ModifierDeformer.h
branches/ge_dev/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/ge_dev/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/ge_dev/source/gameengine/Converter/BL_ShapeDeformer.h
branches/ge_dev/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/ge_dev/source/gameengine/Converter/BL_SkinDeformer.h
branches/ge_dev/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ge_dev/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/ge_dev/source/gameengine/Converter/KX_ConvertActuators.h
branches/ge_dev/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/ge_dev/source/gameengine/Converter/KX_ConvertControllers.h
branches/ge_dev/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/ge_dev/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/ge_dev/source/gameengine/Converter/KX_ConvertSensors.h
branches/ge_dev/source/gameengine/Expressions/BoolValue.cpp
branches/ge_dev/source/gameengine/Expressions/BoolValue.h
branches/ge_dev/source/gameengine/Expressions/CMakeLists.txt
branches/ge_dev/source/gameengine/Expressions/ErrorValue.cpp
branches/ge_dev/source/gameengine/Expressions/ErrorValue.h
branches/ge_dev/source/gameengine/Expressions/FloatValue.cpp
branches/ge_dev/source/gameengine/Expressions/FloatValue.h
branches/ge_dev/source/gameengine/Expressions/IfExpr.cpp
branches/ge_dev/source/gameengine/Expressions/InputParser.cpp
branches/ge_dev/source/gameengine/Expressions/InputParser.h
branches/ge_dev/source/gameengine/Expressions/IntValue.cpp
branches/ge_dev/source/gameengine/Expressions/IntValue.h
branches/ge_dev/source/gameengine/Expressions/ListValue.cpp
branches/ge_dev/source/gameengine/Expressions/ListValue.h
branches/ge_dev/source/gameengine/Expressions/Makefile
branches/ge_dev/source/gameengine/Expressions/PyObjectPlus.cpp
branches/ge_dev/source/gameengine/Expressions/PyObjectPlus.h
branches/ge_dev/source/gameengine/Expressions/SConscript
branches/ge_dev/source/gameengine/Expressions/StringValue.cpp
branches/ge_dev/source/gameengine/Expressions/StringValue.h
branches/ge_dev/source/gameengine/Expressions/Value.cpp
branches/ge_dev/source/gameengine/Expressions/Value.h
branches/ge_dev/source/gameengine/Expressions/VectorValue.cpp
branches/ge_dev/source/gameengine/Expressions/VectorValue.h
branches/ge_dev/source/gameengine/GameLogic/CMakeLists.txt
branches/ge_dev/source/gameengine/GameLogic/Joystick/Makefile
branches/ge_dev/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/ge_dev/source/gameengine/GameLogic/Makefile
branches/ge_dev/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_EventManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_EventManager.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ExpressionController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_IActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_IActuator.h
branches/ge_dev/source/gameengine/GameLogic/SCA_IController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_IController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/ge_dev/source/gameengine/GameLogic/SCA_IObject.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_IObject.h
branches/ge_dev/source/gameengine/GameLogic/SCA_IScene.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_IScene.h
branches/ge_dev/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ISensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_LogicManager.h
branches/ge_dev/source/gameengine/GameLogic/SCA_MouseManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_NORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_ORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_PythonController.h
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/ge_dev/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SCA_XORController.cpp
branches/ge_dev/source/gameengine/GameLogic/SConscript
branches/ge_dev/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/ge_dev/source/gameengine/GamePlayer/CMakeLists.txt
branches/ge_dev/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/ge_dev/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/ge_dev/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/ge_dev/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/ge_dev/source/gameengine/Ketsji/BL_BlenderShader.h
branches/ge_dev/source/gameengine/Ketsji/BL_Material.cpp
branches/ge_dev/source/gameengine/Ketsji/BL_Material.h
branches/ge_dev/source/gameengine/Ketsji/BL_Shader.cpp
branches/ge_dev/source/gameengine/Ketsji/CMakeLists.txt
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/Makefile
branches/ge_dev/source/gameengine/Ketsji/KXNetwork/SConscript
branches/ge_dev/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/ge_dev/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/ge_dev/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Camera.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Camera.h
branches/ge_dev/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/ge_dev/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Dome.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Dome.h
branches/ge_dev/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_GameObject.h
branches/ge_dev/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_IPhysicsController.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/ge_dev/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/ge_dev/source/gameengine/Ketsji/KX_Light.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Light.h
branches/ge_dev/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_MeshProxy.h
branches/ge_dev/source/gameengine/Ketsji/KX_MotionState.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_MotionState.h
branches/ge_dev/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_NearSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_OdePhysicsController.h
branches/ge_dev/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_ParentActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PolyProxy.h
branches/ge_dev/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/ge_dev/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PythonInit.h
branches/ge_dev/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_RadarSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_RayEventManager.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_RaySensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Scene.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_Scene.h
branches/ge_dev/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SceneActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_SoundActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_StateActuator.h
branches/ge_dev/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/ge_dev/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_TouchSensor.h
branches/ge_dev/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_VertexProxy.h
branches/ge_dev/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/ge_dev/source/gameengine/Ketsji/SConscript
branches/ge_dev/source/gameengine/Network/NG_NetworkScene.cpp
branches/ge_dev/source/gameengine/Physics/BlOde/OdePhysicsController.cpp
branches/ge_dev/source/gameengine/Physics/BlOde/OdePhysicsController.h
branches/ge_dev/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
branches/ge_dev/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
branches/ge_dev/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/ge_dev/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
branches/ge_dev/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/ge_dev/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/ge_dev/source/gameengine/Physics/Bullet/Makefile
branches/ge_dev/source/gameengine/Physics/Bullet/SConscript
branches/ge_dev/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/ge_dev/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsController.h
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/ge_dev/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/ge_dev/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/ge_dev/source/gameengine/Physics/common/PHY_IMotionState.h
branches/ge_dev/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/ge_dev/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/ge_dev/source/gameengine/PyDoc/GameLogic.py
branches/ge_dev/source/gameengine/PyDoc/GameTypes.py
branches/ge_dev/source/gameengine/PyDoc/Rasterizer.py
branches/ge_dev/source/gameengine/PyDoc/bge_api_validate_py.txt
branches/ge_dev/source/gameengine/PyDoc/epy_docgen.sh
branches/ge_dev/source/gameengine/Rasterizer/CMakeLists.txt
branches/ge_dev/source/gameengine/Rasterizer/Makefile
branches/ge_dev/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_Deformer.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/ge_dev/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/ge_dev/source/gameengine/Rasterizer/SConscript
branches/ge_dev/source/gameengine/SceneGraph/SG_IObject.cpp
branches/ge_dev/source/gameengine/SceneGraph/SG_IObject.h
branches/ge_dev/source/gameengine/SceneGraph/SG_Node.cpp
branches/ge_dev/source/gameengine/SceneGraph/SG_Node.h
branches/ge_dev/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/ge_dev/source/gameengine/SceneGraph/SG_Spatial.h
branches/ge_dev/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/ge_dev/source/gameengine/VideoTexture/FilterColor.cpp
branches/ge_dev/source/gameengine/VideoTexture/FilterNormal.cpp
branches/ge_dev/source/gameengine/VideoTexture/FilterSource.cpp
branches/ge_dev/source/gameengine/VideoTexture/ImageBuff.cpp
branches/ge_dev/source/gameengine/VideoTexture/ImageMix.cpp
branches/ge_dev/source/gameengine/VideoTexture/ImageRender.cpp
branches/ge_dev/source/gameengine/VideoTexture/ImageViewport.cpp
branches/ge_dev/source/gameengine/VideoTexture/Texture.cpp
branches/ge_dev/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/ge_dev/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/ge_dev/source/kernel/gen_system/GEN_HashedPtr.cpp
branches/ge_dev/tools/btools.py
Added Paths:
-----------
branches/ge_dev/release/scripts/image_2d_cutout.py
branches/ge_dev/release/scripts/object_active_to_other.py
branches/ge_dev/release/scripts/wizard_bolt_factory.py
branches/ge_dev/release/scripts/wizard_landscape_ant.py
branches/ge_dev/release/windows/extra/python26.zip
branches/ge_dev/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/ge_dev/source/gameengine/Ketsji/KX_PythonSeq.h
branches/ge_dev/source/gameengine/PyDoc/API_intro.py
branches/ge_dev/source/gameengine/SceneGraph/SG_DList.h
branches/ge_dev/source/gameengine/SceneGraph/SG_QList.h
Removed Paths:
-------------
branches/ge_dev/release/scripts/bpymodules/BPyMesh_octree.py
branches/ge_dev/release/scripts/xfig_export.py
branches/ge_dev/release/windows/extra/python26.zip
branches/ge_dev/source/gameengine/PyDoc/BL_ActionActuator.py
branches/ge_dev/source/gameengine/PyDoc/BL_Shader.py
branches/ge_dev/source/gameengine/PyDoc/BL_ShapeActionActuator.py
branches/ge_dev/source/gameengine/PyDoc/CListValue.py
branches/ge_dev/source/gameengine/PyDoc/CPropValue.py
branches/ge_dev/source/gameengine/PyDoc/CValue.py
branches/ge_dev/source/gameengine/PyDoc/KX_BlenderMaterial.py
branches/ge_dev/source/gameengine/PyDoc/KX_CDActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_Camera.py
branches/ge_dev/source/gameengine/PyDoc/KX_CameraActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_ConstraintWrapper.py
branches/ge_dev/source/gameengine/PyDoc/KX_GameActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_GameObject.py
branches/ge_dev/source/gameengine/PyDoc/KX_IpoActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_LightObject.py
branches/ge_dev/source/gameengine/PyDoc/KX_MeshProxy.py
branches/ge_dev/source/gameengine/PyDoc/KX_MouseFocusSensor.py
branches/ge_dev/source/gameengine/PyDoc/KX_NearSensor.py
branches/ge_dev/source/gameengine/PyDoc/KX_NetworkMessageActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_NetworkMessageSensor.py
branches/ge_dev/source/gameengine/PyDoc/KX_ObjectActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_ParentActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_PhysicsObjectWrapper.py
branches/ge_dev/source/gameengine/PyDoc/KX_PolyProxy.py
branches/ge_dev/source/gameengine/PyDoc/KX_PolygonMaterial.py
branches/ge_dev/source/gameengine/PyDoc/KX_RadarSensor.py
branches/ge_dev/source/gameengine/PyDoc/KX_RaySensor.py
branches/ge_dev/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_SCA_DynamicActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_SCA_EndObjectActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_Scene.py
branches/ge_dev/source/gameengine/PyDoc/KX_SceneActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_SoundActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_StateActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_TouchSensor.py
branches/ge_dev/source/gameengine/PyDoc/KX_TrackToActuator.py
branches/ge_dev/source/gameengine/PyDoc/KX_VehicleWrapper.py
branches/ge_dev/source/gameengine/PyDoc/KX_VertexProxy.py
branches/ge_dev/source/gameengine/PyDoc/KX_VisibilityActuator.py
branches/ge_dev/source/gameengine/PyDoc/PyObjectPlus.py
branches/ge_dev/source/gameengine/PyDoc/SCA_2DFilterActuator.py
branches/ge_dev/source/gameengine/PyDoc/SCA_ANDController.py
branches/ge_dev/source/gameengine/PyDoc/SCA_ActuatorSensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_AlwaysSensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_DelaySensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_IActuator.py
branches/ge_dev/source/gameengine/PyDoc/SCA_IController.py
branches/ge_dev/source/gameengine/PyDoc/SCA_ILogicBrick.py
branches/ge_dev/source/gameengine/PyDoc/SCA_IObject.py
branches/ge_dev/source/gameengine/PyDoc/SCA_ISensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_JoystickSensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_KeyboardSensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_MouseSensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_NANDController.py
branches/ge_dev/source/gameengine/PyDoc/SCA_NORController.py
branches/ge_dev/source/gameengine/PyDoc/SCA_ORController.py
branches/ge_dev/source/gameengine/PyDoc/SCA_PropertyActuator.py
branches/ge_dev/source/gameengine/PyDoc/SCA_PropertySensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_PythonController.py
branches/ge_dev/source/gameengine/PyDoc/SCA_RandomActuator.py
branches/ge_dev/source/gameengine/PyDoc/SCA_RandomSensor.py
branches/ge_dev/source/gameengine/PyDoc/SCA_XNORController.py
branches/ge_dev/source/gameengine/PyDoc/SCA_XORController.py
branches/ge_dev/source/gameengine/PyDoc/WhatsNew.py
Modified: branches/ge_dev/CMake/macros.cmake
===================================================================
--- branches/ge_dev/CMake/macros.cmake 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/CMake/macros.cmake 2009-05-20 21:32:56 UTC (rev 20308)
@@ -59,7 +59,24 @@
MACRO(SETUP_LIBLINKS
target)
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_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_LIB} ${PNG_LIB} ${ZLIB_LIB} ${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
+
+ IF(WIN32)
+
+ TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+
+ TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+
+ ELSE(WIN32)
+
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+
+ ENDIF(WIN32)
+
IF(WITH_INTERNATIONAL)
TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
Modified: branches/ge_dev/CMakeLists.txt
===================================================================
--- branches/ge_dev/CMakeLists.txt 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/CMakeLists.txt 2009-05-20 21:32:56 UTC (rev 20308)
@@ -99,20 +99,6 @@
ENDIF(OPENAL_FOUND)
ENDIF(WITH_OPENAL)
- FIND_LIBRARY(ALUT_LIBRARY
- NAMES alut
- PATHS
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- )
- IF(ALUT_LIBRARY)
- SET(OPENAL_LIB ${OPENAL_LIB} ${ALUT_LIBRARY})
- ENDIF(ALUT_LIBRARY)
-
FIND_LIBRARY(INTL_LIBRARY
NAMES intl
PATHS
@@ -464,20 +450,18 @@
#-----------------------------------------------------------------------------
# Libraries
FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
-SUBDIRS(
- intern
- extern
- source
-)
+ADD_SUBDIRECTORY(intern)
+ADD_SUBDIRECTORY(extern)
+ADD_SUBDIRECTORY(source)
#-----------------------------------------------------------------------------
# Blender Application
-SUBDIRS(source/creator)
+ADD_SUBDIRECTORY(source/creator)
#-----------------------------------------------------------------------------
# Blender Player
IF(WITH_PLAYER)
- SUBDIRS(blenderplayer)
+ ADD_SUBDIRECTORY(blenderplayer)
ENDIF(WITH_PLAYER)
Modified: branches/ge_dev/config/irix6-config.py
===================================================================
--- branches/ge_dev/config/irix6-config.py 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/config/irix6-config.py 2009-05-20 21:32:56 UTC (rev 20308)
@@ -24,11 +24,6 @@
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
BF_OPENAL_LIBPATH = LIBDIR + '/lib'
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# BF_OPENAL_LIB = 'openal alut'
-# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
-
BF_CXX = '/usr'
WITH_BF_STATICCXX = 'false'
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
Modified: branches/ge_dev/config/linux2-config.py
===================================================================
--- branches/ge_dev/config/linux2-config.py 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/config/linux2-config.py 2009-05-20 21:32:56 UTC (rev 20308)
@@ -4,8 +4,16 @@
WITH_BF_VERSE = False
BF_VERSE_INCLUDE = "#extern/verse/dist"
+def py_version_string():
+ '''
+ returns py version - "2.5", "2.6" etc
+ '''
+ import platform
+ ver = platform.python_version_tuple()
+ return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6 ints
+
BF_PYTHON = '/usr'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = py_version_string()
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
@@ -20,11 +28,6 @@
BF_OPENAL_LIB = 'openal'
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-# some distros have a separate libalut
-# if you get linker complaints, you need to uncomment the line below
-# BF_OPENAL_LIB = 'openal alut'
-# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
-
BF_CXX = '/usr'
WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
@@ -78,7 +81,8 @@
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE=False
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
WITH_BF_ODE = False
BF_ODE = LIBDIR + '/ode'
Modified: branches/ge_dev/extern/CMakeLists.txt
===================================================================
--- branches/ge_dev/extern/CMakeLists.txt 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/extern/CMakeLists.txt 2009-05-20 21:32:56 UTC (rev 20308)
@@ -25,27 +25,28 @@
# ***** END GPL LICENSE BLOCK *****
IF(WITH_GAMEENGINE)
- SUBDIRS(qhull solid)
+ ADD_SUBDIRECTORY(qhull)
+ ADD_SUBDIRECTORY(solid)
ENDIF(WITH_GAMEENGINE)
IF(WITH_BULLET)
- SUBDIRS(bullet2)
+ ADD_SUBDIRECTORY(bullet2)
ENDIF(WITH_BULLET)
IF(WITH_INTERNATIONAL)
- SUBDIRS(bFTGL)
+ ADD_SUBDIRECTORY(bFTGL)
ENDIF(WITH_INTERNATIONAL)
IF(WITH_VERSE)
- SUBDIRS(verse)
+ ADD_SUBDIRECTORY(verse)
ENDIF(WITH_VERSE)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- SUBDIRS(binreloc)
+ ADD_SUBDIRECTORY(binreloc)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-SUBDIRS(glew)
+ADD_SUBDIRECTORY(glew)
IF(WITH_OPENJPEG)
- SUBDIRS(libopenjpeg)
+ ADD_SUBDIRECTORY(libopenjpeg)
ENDIF(WITH_OPENJPEG)
Modified: branches/ge_dev/extern/bullet2/src/CMakeLists.txt
===================================================================
--- branches/ge_dev/extern/bullet2/src/CMakeLists.txt 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/extern/bullet2/src/CMakeLists.txt 2009-05-20 21:32:56 UTC (rev 20308)
@@ -1 +1,4 @@
-SUBDIRS( BulletCollision BulletDynamics LinearMath BulletSoftBody )
+ADD_SUBDIRECTORY(BulletCollision)
+ADD_SUBDIRECTORY(BulletDynamics)
+ADD_SUBDIRECTORY(LinearMath)
+ADD_SUBDIRECTORY(BulletSoftBody )
Modified: branches/ge_dev/extern/verse/CMakeLists.txt
===================================================================
--- branches/ge_dev/extern/verse/CMakeLists.txt 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/extern/verse/CMakeLists.txt 2009-05-20 21:32:56 UTC (rev 20308)
@@ -24,5 +24,5 @@
#
# ***** END GPL LICENSE BLOCK *****
-SUBDIRS(dist)
+ADD_SUBDIRECTORY(dist)
Modified: branches/ge_dev/extern/verse/dist/CMakeLists.txt
===================================================================
--- branches/ge_dev/extern/verse/dist/CMakeLists.txt 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/extern/verse/dist/CMakeLists.txt 2009-05-20 21:32:56 UTC (rev 20308)
@@ -24,7 +24,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-SUBDIRS(mkprot_cmd)
+ADD_SUBDIRECTORY(mkprot_cmd)
SET(SRC_MKPROT_OUT
v_gen_pack_init.c
Modified: branches/ge_dev/intern/CMakeLists.txt
===================================================================
--- branches/ge_dev/intern/CMakeLists.txt 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/intern/CMakeLists.txt 2009-05-20 21:32:56 UTC (rev 20308)
@@ -24,10 +24,22 @@
#
# ***** END GPL LICENSE BLOCK *****
-SUBDIRS(SoundSystem string ghost guardedalloc bmfont moto container memutil decimation iksolver itasc boolop opennl)
+ADD_SUBDIRECTORY(SoundSystem)
+ADD_SUBDIRECTORY(string)
+ADD_SUBDIRECTORY(ghost)
+ADD_SUBDIRECTORY(guardedalloc)
+ADD_SUBDIRECTORY(bmfont)
+ADD_SUBDIRECTORY(moto)
+ADD_SUBDIRECTORY(container)
+ADD_SUBDIRECTORY(memutil)
+ADD_SUBDIRECTORY(decimation)
+ADD_SUBDIRECTORY(iksolver)
+ADD_SUBDIRECTORY(itasc)
+ADD_SUBDIRECTORY(boolop)
+ADD_SUBDIRECTORY(opennl)
IF(WITH_ELBEEM)
- SUBDIRS(elbeem)
+ ADD_SUBDIRECTORY(elbeem)
ENDIF(WITH_ELBEEM)
-SUBDIRS(bsp)
+ADD_SUBDIRECTORY(bsp)
Modified: branches/ge_dev/intern/SoundSystem/openal/SND_OpenALDevice.cpp
===================================================================
--- branches/ge_dev/intern/SoundSystem/openal/SND_OpenALDevice.cpp 2009-05-20 20:39:18 UTC (rev 20307)
+++ branches/ge_dev/intern/SoundSystem/openal/SND_OpenALDevice.cpp 2009-05-20 21:32:56 UTC (rev 20308)
@@ -43,11 +43,9 @@
#ifdef APPLE_FRAMEWORK_FIX
#include <al.h>
#include <alc.h>
-#include <alut.h>
#else
#include <AL/al.h>
#include <AL/alc.h>
-#include <AL/alut.h>
#endif
#include <stdio.h>
@@ -61,13 +59,12 @@
#include <signal.h>
-/* untill openal gets unified we need this hack for non-windows systems */
-#if !defined(WIN32) && !defined(ALC_MAJOR_VERSION)
+/*************************** ALUT replacement *****************************/
-#include <malloc.h>
+/* instead of relying on alut, we just implement our own
+ * WAV loading functions, hopefully more reliable */
-ALvoid alutLoadWAVMemory(ALbyte *memory,ALenum *format,ALvoid **data,ALsizei *size,ALsizei *freq,ALboolean *loop);
-ALvoid alutUnloadWAV(ALenum format,ALvoid *data,ALsizei size,ALsizei freq);
+#include <stdlib.h>
typedef struct /* WAV File-header */
{
@@ -120,94 +117,190 @@
ALuint Size;
} WAVChunkHdr_Struct;
-ALvoid alutLoadWAVMemory(ALbyte *memory,ALenum *format,ALvoid **data,ALsizei *size,ALsizei *freq,ALboolean *loop)
+static void *SND_loadFileIntoMemory(const char *filename, int *len_r)
{
+ FILE *fp= fopen(filename, "rb");
+ void *data;
+
+ if (!fp) {
+ *len_r= -1;
+ return NULL;
+ }
+
+ fseek(fp, 0L, SEEK_END);
+ *len_r= ftell(fp);
+ fseek(fp, 0L, SEEK_SET);
+
+ data= malloc(*len_r);
+ if (!data) {
+ *len_r= -1;
+ return NULL;
+ }
+
+ if (fread(data, *len_r, 1, fp)!=1) {
+ *len_r= -1;
+ free(data);
+ return NULL;
+ }
+
+ return data;
+}
+
+#define TEST_SWITCH_INT(a) if(big_endian) { \
+ char s_i, *p_i; \
+ p_i= (char *)&(a); \
+ s_i=p_i[0]; p_i[0]=p_i[3]; p_i[3]=s_i; \
+ s_i=p_i[1]; p_i[1]=p_i[2]; p_i[2]=s_i; }
+
+#define TEST_SWITCH_SHORT(a) if(big_endian) { \
+ char s_i, *p_i; \
+ p_i= (char *)&(a); \
+ s_i=p_i[0]; p_i[0]=p_i[1]; p_i[1]=s_i; }
+
+static int stream_read(void *out, ALbyte **stream, ALsizei size, ALsizei *memsize)
+{
+ if(size <= *memsize) {
+ memcpy(out, *stream, size);
+ return 1;
+ }
+ else {
+ memset(out, 0, size);
+ return 0;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list