diff options
Diffstat (limited to 'source/gameengine')
17 files changed, 278 insertions, 51 deletions
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index 853cba543a4..661f9c5b25d 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -1,6 +1,4 @@ -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -37,6 +35,17 @@ SET(INC ../../../extern/glew/include ) +SET(SRC + BL_KetsjiEmbedStart.cpp + KX_BlenderCanvas.cpp + KX_BlenderGL.cpp + KX_BlenderInputDevice.cpp + KX_BlenderKeyboardDevice.cpp + KX_BlenderMouseDevice.cpp + KX_BlenderRenderTools.cpp + KX_BlenderSystem.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) IF(WITH_FFMPEG) diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index 87e413c3a44..e6b5f6c81a0 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -63,6 +61,30 @@ SET(INC ../../../extern/bullet2/src ) +SET(SRC + BL_ActionActuator.cpp + BL_ArmatureActuator.cpp + BL_ArmatureChannel.cpp + BL_ArmatureConstraint.cpp + BL_ArmatureObject.cpp + BL_BlenderDataConversion.cpp + BL_DeformableGameObject.cpp + BL_MeshDeformer.cpp + BL_ModifierDeformer.cpp + BL_ShapeActionActuator.cpp + BL_ShapeDeformer.cpp + BL_SkinDeformer.cpp + BlenderWorldInfo.cpp + KX_BlenderScalarInterpolator.cpp + KX_BlenderSceneConverter.cpp + KX_ConvertActuators.cpp + KX_ConvertControllers.cpp + KX_ConvertProperties.cpp + KX_ConvertSensors.cpp + KX_IpoConvert.cpp + KX_SoftBodyDeformer.cpp +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt index 126192d2188..828afa7ae92 100644 --- a/source/gameengine/Expressions/CMakeLists.txt +++ b/source/gameengine/Expressions/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -36,6 +34,28 @@ SET(INC ../../../source/blender/blenloader ) +SET(SRC + BoolValue.cpp + ConstExpr.cpp + EXP_C-Api.cpp + EmptyValue.cpp + ErrorValue.cpp + Expression.cpp + FloatValue.cpp + IdentifierExpr.cpp + IfExpr.cpp + InputParser.cpp + IntValue.cpp + KX_HashedPtr.cpp + ListValue.cpp + Operator1Expr.cpp + Operator2Expr.cpp + PyObjectPlus.cpp + StringValue.cpp + Value.cpp + VectorValue.cpp +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt index 84d915847e9..57150a90e99 100644 --- a/source/gameengine/GameLogic/CMakeLists.txt +++ b/source/gameengine/GameLogic/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp Joystick/*.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -36,6 +34,51 @@ SET(INC ../../../source/gameengine/Rasterizer ) +SET(SRC + Joystick/SCA_Joystick.cpp + Joystick/SCA_JoystickEvents.cpp + SCA_2DFilterActuator.cpp + SCA_ANDController.cpp + SCA_ActuatorEventManager.cpp + SCA_ActuatorSensor.cpp + SCA_AlwaysEventManager.cpp + SCA_AlwaysSensor.cpp + SCA_BasicEventManager.cpp + SCA_DelaySensor.cpp + SCA_EventManager.cpp + SCA_ExpressionController.cpp + SCA_IActuator.cpp + SCA_IController.cpp + SCA_IInputDevice.cpp + SCA_ILogicBrick.cpp + SCA_IObject.cpp + SCA_IScene.cpp + SCA_ISensor.cpp + SCA_JoystickManager.cpp + SCA_JoystickSensor.cpp + SCA_KeyboardManager.cpp + SCA_KeyboardSensor.cpp + SCA_LogicManager.cpp + SCA_MouseManager.cpp + SCA_MouseSensor.cpp + SCA_NANDController.cpp + SCA_NORController.cpp + SCA_ORController.cpp + SCA_PropertyActuator.cpp + SCA_PropertyEventManager.cpp + SCA_PropertySensor.cpp + SCA_PythonController.cpp + SCA_PythonKeyboard.cpp + SCA_PythonMouse.cpp + SCA_RandomActuator.cpp + SCA_RandomEventManager.cpp + SCA_RandomNumberGenerator.cpp + SCA_RandomSensor.cpp + SCA_TimeEventManager.cpp + SCA_XNORController.cpp + SCA_XORController.cpp +) + IF(WITH_SDL) SET(INC ${INC} ${SDL_INCLUDE_DIR}) ELSE(WITH_SDL) diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 08a4aa50a00..47ac7f73a51 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -24,19 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC - bmfont.cpp - GPC_Canvas.cpp - GPC_Engine.cpp - GPC_KeyboardDevice.cpp - GPC_MouseDevice.cpp - GPC_RawImage.cpp - GPC_RawLoadDotBlendArray.cpp - GPC_RawLogoArrays.cpp - GPC_RenderTools.cpp - GPC_System.cpp -) - SET(INC . ../../../../intern/string @@ -71,6 +58,19 @@ SET(INC ${ZLIB_INC} ) +SET(SRC + bmfont.cpp + GPC_Canvas.cpp + GPC_Engine.cpp + GPC_KeyboardDevice.cpp + GPC_MouseDevice.cpp + GPC_RawImage.cpp + GPC_RawLoadDotBlendArray.cpp + GPC_RawLogoArrays.cpp + GPC_RenderTools.cpp + GPC_System.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}") diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 8164878762c..6ce9f7be280 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -24,14 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC - GPG_Application.cpp - GPG_Canvas.cpp - GPG_ghost.cpp - GPG_KeyboardDevice.cpp - GPG_System.cpp -) - SET(INC . ../../../../intern/string @@ -66,6 +58,14 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + GPG_Application.cpp + GPG_Canvas.cpp + GPG_ghost.cpp + GPG_KeyboardDevice.cpp + GPG_System.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) IF(WITH_FFMPEG) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index b128f33c6e4..68f0a0de994 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -59,6 +57,76 @@ SET(INC ../../../extern/glew/include ) +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_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_NearSensor.cpp + KX_ObColorIpoSGController.cpp + KX_ObjectActuator.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_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 +) + ADD_DEFINITIONS(-DGLEW_STATIC) IF(WITH_SDL) diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt index 106d1a84a92..2b1c1a698f3 100644 --- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt +++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../../source/kernel/gen_system @@ -38,6 +36,14 @@ SET(INC ../../../../source/gameengine/Network ) +SET(SRC + KX_NetworkEventManager.cpp + KX_NetworkMessageActuator.cpp + KX_NetworkMessageSensor.cpp + KX_NetworkObjectActuator.cpp + KX_NetworkObjectSensor.cpp +) + IF(WITH_PYTHON) LIST(APPEND INC ${PYTHON_INC}) ELSE(WITH_PYTHON) diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt index 795e63b47c3..3dde84d29c1 100644 --- a/source/gameengine/Network/CMakeLists.txt +++ b/source/gameengine/Network/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -33,4 +31,10 @@ SET(INC ../../../intern/moto/include ) +SET(SRC + NG_NetworkMessage.cpp + NG_NetworkObject.cpp + NG_NetworkScene.cpp +) + BLENDERLIB(bf_ngnetwork "${SRC}" "${INC}") diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt index e7c34f5a2a0..eae2971ce6a 100644 --- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt +++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC NG_LoopBackNetworkDeviceInterface.cpp) - SET(INC . ../../../../source/kernel/gen_system @@ -33,4 +31,8 @@ SET(INC ../../../../source/gameengine/Network ) +SET(SRC + NG_LoopBackNetworkDeviceInterface.cpp +) + BLENDERLIB(bf_loopbacknetwork "${SRC}" "${INC}") diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt index ba6f3bef0db..faa9385a745 100644 --- a/source/gameengine/Physics/Bullet/CMakeLists.txt +++ b/source/gameengine/Physics/Bullet/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp) - SET(INC . ../common @@ -46,6 +44,12 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + CcdPhysicsEnvironment.cpp + CcdPhysicsController.cpp + CcdGraphicController.cpp +) + IF(WITH_BULLET) ADD_DEFINITIONS(-DUSE_BULLET) ENDIF(WITH_BULLET) diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt index 18330392cd7..501fbcd94de 100644 --- a/source/gameengine/Physics/Dummy/CMakeLists.txt +++ b/source/gameengine/Physics/Dummy/CMakeLists.txt @@ -24,11 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC DummyPhysicsEnvironment.cpp) - SET(INC . ../common ) +SET(SRC + DummyPhysicsEnvironment.cpp +) + BLENDERLIB(bf_dummy "${SRC}" "${INC}") diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt index 0f8f59f3b78..0389280340f 100644 --- a/source/gameengine/Physics/common/CMakeLists.txt +++ b/source/gameengine/Physics/common/CMakeLists.txt @@ -24,12 +24,19 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp PHY_IGraphicController.cpp PHY_IPhysicsEnvironment.cpp PHY_IVehicle.cpp) - SET(INC . ../Dummy ../../../intern/moto/include ) +SET(SRC + PHY_IMotionState.cpp + PHY_IController.cpp + PHY_IPhysicsController.cpp + PHY_IGraphicController.cpp + PHY_IPhysicsEnvironment.cpp + PHY_IVehicle.cpp +) + BLENDERLIB(bf_common "${SRC}" "${INC}") diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt index d718bf3e507..9bbf7e144d5 100644 --- a/source/gameengine/Rasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/kernel/gen_system @@ -40,6 +38,19 @@ SET(INC ${PYTHON_INC} ) +SET(SRC + RAS_2DFilterManager.cpp + RAS_BucketManager.cpp + RAS_FramingManager.cpp + RAS_IPolygonMaterial.cpp + RAS_IRenderTools.cpp + RAS_MaterialBucket.cpp + RAS_MeshObject.cpp + RAS_Polygon.cpp + RAS_TexVert.cpp + RAS_texmatrix.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB(bf_rasterizer "${SRC}" "${INC}") diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt index cc48952dc20..a89faae3c73 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC ../../../../source/kernel/gen_system ../../../../intern/string @@ -41,6 +39,13 @@ SET(INC ../../../../source/blender/blenloader ) +SET(SRC + RAS_GLExtensionManager.cpp + RAS_ListRasterizer.cpp + RAS_OpenGLRasterizer.cpp + RAS_VAOpenGLRasterizer.cpp +) + ADD_DEFINITIONS(-DGLEW_STATIC) BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}") diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt index a73130531c0..d1b207b6efa 100644 --- a/source/gameengine/SceneGraph/CMakeLists.txt +++ b/source/gameengine/SceneGraph/CMakeLists.txt @@ -24,11 +24,18 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../intern/moto/include ) +SET(SRC + SG_BBox.cpp + SG_Controller.cpp + SG_IObject.cpp + SG_Node.cpp + SG_Spatial.cpp + SG_Tree.cpp +) + BLENDERLIB(bf_scenegraph "${SRC}" "${INC}") diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt index 34a32328e29..1c624482d30 100644 --- a/source/gameengine/VideoTexture/CMakeLists.txt +++ b/source/gameengine/VideoTexture/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp) - SET(INC . ../../../source/gameengine/Ketsji @@ -51,6 +49,25 @@ SET(INC ../../../extern/glew/include ) +SET(SRC + Exception.cpp + FilterBase.cpp + FilterBlueScreen.cpp + FilterColor.cpp + FilterNormal.cpp + FilterSource.cpp + ImageBase.cpp + ImageBuff.cpp + ImageMix.cpp + ImageRender.cpp + ImageViewport.cpp + PyTypeList.cpp + Texture.cpp + VideoBase.cpp + VideoFFmpeg.cpp + blendVideoTex.cpp +) + IF(WITH_FFMPEG) SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) |