synched with trunk at revision 34793

1 files changed, 171 insertions, 23 deletions

diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 18ee86cea13..12b4ae171bd 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -24,9 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-FILE(GLOB SRC *.cpp)
-
-SET(INC
+set(INC
 	.
 	../../../source/kernel/gen_system
 	../../../intern/string
@@ -34,15 +32,14 @@ SET(INC
 	../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
 	../../../source/gameengine/Converter
 	../../../source/blender/imbuf
-	../../../intern/ghost/include
 	../../../intern/moto/include
 	../../../source/gameengine/Ketsji 
 	../../../source/blender/blenlib
+	../../../source/blender/blenfont
 	../../../source/blender/blenkernel
 	../../../source/blender/python
 	../../../source/blender/python/generic
 	../../../source/blender 
-	../../../source/blender/include
 	../../../source/blender/makesdna 
 	../../../source/gameengine/Rasterizer 
 	../../../source/gameengine/GameLogic
@@ -51,35 +48,186 @@ SET(INC
 	../../../source/gameengine/Network
 	../../../source/gameengine/SceneGraph 
 	../../../source/gameengine/Physics/common
-	../../../source/gameengine/Physics/Bullet 
 	../../../source/gameengine/Network/LoopBackNetwork
 	../../../intern/audaspace/intern
-	../../../source/blender/misc 
 	../../../source/blender/blenloader
 	../../../source/blender/gpu
-	../../../extern/bullet2/src
 	../../../extern/glew/include
 	../../../extern/recastnavigation/Recast/Include
 	../../../extern/recastnavigation/Detour/Include
 	../../../source/blender/editors/include
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
+set(SRC
+	BL_BlenderShader.cpp
+	BL_Material.cpp
+	BL_Shader.cpp
+	BL_Texture.cpp
+	KX_ArmatureSensor.cpp
+	KX_BlenderMaterial.cpp
+	KX_BulletPhysicsController.cpp
+	KX_Camera.cpp
+	KX_CameraActuator.cpp
+	KX_CameraIpoSGController.cpp
+	KX_ConstraintActuator.cpp
+	KX_ConstraintWrapper.cpp
+	KX_ConvertPhysicsObjects.cpp
+	KX_Dome.cpp
+	KX_EmptyObject.cpp
+	KX_FontObject.cpp
+	KX_GameActuator.cpp
+	KX_GameObject.cpp
+	KX_IPO_SGController.cpp
+	KX_IPhysicsController.cpp
+	KX_IpoActuator.cpp
+	KX_KetsjiEngine.cpp
+	KX_Light.cpp
+	KX_LightIpoSGController.cpp
+	KX_MaterialIpoController.cpp
+	KX_MeshProxy.cpp
+	KX_MotionState.cpp
+	KX_MouseFocusSensor.cpp
+	KX_NavMeshObject.cpp
+	KX_NearSensor.cpp
+	KX_ObColorIpoSGController.cpp
+	KX_ObjectActuator.cpp
+	KX_ObstacleSimulation.cpp
+	KX_OrientationInterpolator.cpp
+	KX_ParentActuator.cpp
+	KX_PhysicsObjectWrapper.cpp
+	KX_PolyProxy.cpp
+	KX_PolygonMaterial.cpp
+	KX_PositionInterpolator.cpp
+	KX_PyConstraintBinding.cpp
+	KX_PyMath.cpp
+	KX_PythonInit.cpp
+	KX_PythonInitTypes.cpp
+	KX_PythonSeq.cpp
+	KX_RadarSensor.cpp
+	KX_RayCast.cpp
+	KX_RayEventManager.cpp
+	KX_RaySensor.cpp
+	KX_SCA_AddObjectActuator.cpp
+	KX_SCA_DynamicActuator.cpp
+	KX_SCA_EndObjectActuator.cpp
+	KX_SCA_ReplaceMeshActuator.cpp
+	KX_SG_BoneParentNodeRelationship.cpp
+	KX_SG_NodeRelationships.cpp
+	KX_ScalarInterpolator.cpp
+	KX_ScalingInterpolator.cpp
+	KX_Scene.cpp
+	KX_SceneActuator.cpp
+	KX_SoundActuator.cpp
+	KX_StateActuator.cpp
+	KX_SteeringActuator.cpp
+	KX_TimeCategoryLogger.cpp
+	KX_TimeLogger.cpp
+	KX_TouchEventManager.cpp
+	KX_TouchSensor.cpp
+	KX_TrackToActuator.cpp
+	KX_VehicleWrapper.cpp
+	KX_VertexProxy.cpp
+	KX_VisibilityActuator.cpp
+	KX_WorldInfo.cpp
+	KX_WorldIpoController.cpp
+
+	KX_ArmatureSensor.h
+	KX_BlenderMaterial.h
+	KX_BulletPhysicsController.h
+	KX_Camera.h
+	KX_CameraActuator.h
+	KX_CameraIpoSGController.h
+	KX_ClientObjectInfo.h
+	KX_ConstraintActuator.h
+	KX_ConstraintWrapper.h
+	KX_ConvertPhysicsObject.h
+	KX_Dome.h
+	KX_EmptyObject.h
+	KX_FontObject.h
+	KX_GameActuator.h
+	KX_GameObject.h
+	KX_IInterpolator.h
+	KX_IPOTransform.h
+	KX_IPO_SGController.h
+	KX_IPhysicsController.h
+	KX_IScalarInterpolator.h
+	KX_ISceneConverter.h
+	KX_ISystem.h
+	KX_IpoActuator.h
+	KX_KetsjiEngine.h
+	KX_Light.h
+	KX_LightIpoSGController.h
+	KX_MaterialIpoController.h
+	KX_MeshProxy.h
+	KX_MotionState.h
+	KX_MouseFocusSensor.h
+	KX_NavMeshObject.h
+	KX_NearSensor.h
+	KX_ObColorIpoSGController.h
+	KX_ObjectActuator.h
+	KX_ObstacleSimulation.h
+	KX_OrientationInterpolator.h
+	KX_ParentActuator.h
+	KX_PhysicsEngineEnums.h
+	KX_PhysicsObjectWrapper.h
+	KX_PhysicsPropertiesobsolete.h
+	KX_PolyProxy.h
+	KX_PolygonMaterial.h
+	KX_PositionInterpolator.h
+	KX_PyConstraintBinding.h
+	KX_PyMath.h
+	KX_PythonInit.h
+	KX_PythonInitTypes.h
+	KX_PythonSeq.h
+	KX_RadarSensor.h
+	KX_RayCast.h
+	KX_RayEventManager.h
+	KX_RaySensor.h
+	KX_SCA_AddObjectActuator.h
+	KX_SCA_DynamicActuator.h
+	KX_SCA_EndObjectActuator.h
+	KX_SCA_ReplaceMeshActuator.h
+	KX_SG_BoneParentNodeRelationship.h
+	KX_SG_NodeRelationships.h
+	KX_ScalarInterpolator.h
+	KX_ScalingInterpolator.h
+	KX_Scene.h
+	KX_SceneActuator.h
+	KX_SoundActuator.h
+	KX_StateActuator.h
+	KX_SteeringActuator.h
+	KX_TimeCategoryLogger.h
+	KX_TimeLogger.h
+	KX_TouchEventManager.h
+	KX_TouchSensor.h
+	KX_TrackToActuator.h
+	KX_VehicleWrapper.h
+	KX_VertexProxy.h
+	KX_VisibilityActuator.h
+	KX_WorldInfo.h
+	KX_WorldIpoController.h
+	BL_BlenderShader.h
+	BL_Material.h
+	BL_Shader.h
+	BL_Texture.h
+)
+
+add_definitions(-DGLEW_STATIC)
 
-IF(WITH_SDL)
-	SET(INC ${INC} ${SDL_INCLUDE_DIR})  
-ELSE(WITH_SDL)
-	ADD_DEFINITIONS(-DDISABLE_SDL)
-ENDIF(WITH_SDL)
+if(WITH_SDL)
+	set(INC ${INC} ${SDL_INCLUDE_DIR})  
+else()
+	add_definitions(-DDISABLE_SDL)
+endif()
 
-IF(WITH_PYTHON)
-	LIST(APPEND INC ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-	ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
+if(WITH_CODEC_FFMPEG)
+	add_definitions(-DWITH_FFMPEG)
+endif()
 
-IF(WITH_FFMPEG)
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
+if(WITH_BULLET)
+	add_definitions(-DUSE_BULLET)
+	list(APPEND INC ../../../extern/bullet2/src)
+	list(APPEND INC ../../../source/gameengine/Physics/Bullet )
+endif()
 
-BLENDERLIB(bf_ketsji "${SRC}" "${INC}")
+blender_add_lib(ge_logic_ketsji "${SRC}" "${INC}")