diff options
Diffstat (limited to 'source/gameengine')
19 files changed, 124 insertions, 124 deletions
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index 66a26e9ff79..098cf71ac9f 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -1,5 +1,5 @@ -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../intern/string @@ -32,7 +32,7 @@ SET(INC ../../../extern/glew/include ) -SET(SRC +set(SRC BL_KetsjiEmbedStart.cpp KX_BlenderCanvas.cpp KX_BlenderGL.cpp @@ -51,10 +51,10 @@ SET(SRC KX_BlenderSystem.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -IF(WITH_CODEC_FFMPEG) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + add_definitions(-DWITH_FFMPEG) +endif() -BLENDERLIB(ge_blen_routines "${SRC}" "${INC}") +blenderlib(ge_blen_routines "${SRC}" "${INC}") diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt index 7f8abfec8c5..686cb7cc8fa 100644 --- a/source/gameengine/CMakeLists.txt +++ b/source/gameengine/CMakeLists.txt @@ -25,33 +25,33 @@ # ***** END GPL LICENSE BLOCK ***** # there are too many inter-includes so best define here -IF(WITH_PYTHON) - INCLUDE_DIRECTORIES(${PYTHON_INC}) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + include_directories(${PYTHON_INC}) + add_definitions(-DWITH_PYTHON) +endif() -ADD_SUBDIRECTORY(BlenderRoutines) -ADD_SUBDIRECTORY(Converter) -ADD_SUBDIRECTORY(Expressions) -ADD_SUBDIRECTORY(GameLogic) -ADD_SUBDIRECTORY(Ketsji) -ADD_SUBDIRECTORY(Ketsji/KXNetwork) -ADD_SUBDIRECTORY(Network) -ADD_SUBDIRECTORY(Network/LoopBackNetwork) -ADD_SUBDIRECTORY(Physics/common) -ADD_SUBDIRECTORY(Physics/Dummy) -ADD_SUBDIRECTORY(Rasterizer) -ADD_SUBDIRECTORY(Rasterizer/RAS_OpenGLRasterizer) -ADD_SUBDIRECTORY(SceneGraph) +add_subdirectory(BlenderRoutines) +add_subdirectory(Converter) +add_subdirectory(Expressions) +add_subdirectory(GameLogic) +add_subdirectory(Ketsji) +add_subdirectory(Ketsji/KXNetwork) +add_subdirectory(Network) +add_subdirectory(Network/LoopBackNetwork) +add_subdirectory(Physics/common) +add_subdirectory(Physics/Dummy) +add_subdirectory(Rasterizer) +add_subdirectory(Rasterizer/RAS_OpenGLRasterizer) +add_subdirectory(SceneGraph) -IF(WITH_BULLET) - ADD_SUBDIRECTORY(Physics/Bullet) -ENDIF(WITH_BULLET) +if(WITH_BULLET) + add_subdirectory(Physics/Bullet) +endif() -IF(WITH_PYTHON) - ADD_SUBDIRECTORY(VideoTexture) -ENDIF(WITH_PYTHON) +if(WITH_PYTHON) + add_subdirectory(VideoTexture) +endif() -IF(WITH_PLAYER) - ADD_SUBDIRECTORY(GamePlayer) -ENDIF(WITH_PLAYER) +if(WITH_PLAYER) + add_subdirectory(GamePlayer) +endif() diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index a930fcb0c01..efffd5d2e99 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../intern/string @@ -59,7 +59,7 @@ SET(INC ../../../extern/bullet2/src ) -SET(SRC +set(SRC BL_ActionActuator.cpp BL_ArmatureActuator.cpp BL_ArmatureChannel.cpp @@ -105,8 +105,8 @@ SET(SRC KX_SoftBodyDeformer.h ) -IF(WITH_BULLET) - ADD_DEFINITIONS(-DUSE_BULLET) -ENDIF(WITH_BULLET) +if(WITH_BULLET) + add_definitions(-DUSE_BULLET) +endif() -BLENDERLIB(ge_converter "${SRC}" "${INC}") +blenderlib(ge_converter "${SRC}" "${INC}") diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt index 1197927bb87..5a445bc1f82 100644 --- a/source/gameengine/Expressions/CMakeLists.txt +++ b/source/gameengine/Expressions/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../intern/string @@ -34,7 +34,7 @@ SET(INC ../../../source/blender/blenloader ) -SET(SRC +set(SRC BoolValue.cpp ConstExpr.cpp EXP_C-Api.cpp @@ -78,4 +78,4 @@ SET(SRC VoidValue.h ) -BLENDERLIB(ge_logic_expressions "${SRC}" "${INC}") +blenderlib(ge_logic_expressions "${SRC}" "${INC}") diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt index e8de2ebd53c..d2c6731d530 100644 --- a/source/gameengine/GameLogic/CMakeLists.txt +++ b/source/gameengine/GameLogic/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../intern/string @@ -34,7 +34,7 @@ SET(INC ../../../source/gameengine/Rasterizer ) -SET(SRC +set(SRC Joystick/SCA_Joystick.cpp Joystick/SCA_JoystickEvents.cpp SCA_2DFilterActuator.cpp @@ -123,10 +123,10 @@ SET(SRC SCA_XORController.h ) -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() -BLENDERLIB(ge_logic "${SRC}" "${INC}") +blenderlib(ge_logic "${SRC}" "${INC}") diff --git a/source/gameengine/GamePlayer/CMakeLists.txt b/source/gameengine/GamePlayer/CMakeLists.txt index f0ce3afbe10..ab89b18a09b 100644 --- a/source/gameengine/GamePlayer/CMakeLists.txt +++ b/source/gameengine/GamePlayer/CMakeLists.txt @@ -24,9 +24,9 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(common) -ADD_SUBDIRECTORY(ghost) +add_subdirectory(common) +add_subdirectory(ghost) -IF(WITH_WEBPLUGIN) - ADD_SUBDIRECTORY(xembed) -ENDIF(WITH_WEBPLUGIN) +if(WITH_WEBPLUGIN) + add_subdirectory(xembed) +endif() diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index d3b053c90b1..e0338f672e0 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../../intern/string ../../../../intern/ghost @@ -56,7 +56,7 @@ SET(INC ${ZLIB_INC} ) -SET(SRC +set(SRC bmfont.cpp GPC_Canvas.cpp GPC_Engine.cpp @@ -79,6 +79,6 @@ SET(SRC GPC_System.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -BLENDERLIB_NOLIST(ge_player_common "${SRC}" "${INC}") +blenderlib_nolist(ge_player_common "${SRC}" "${INC}") diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 906ece9ded8..7078296ac32 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../../intern/string ../../../../intern/ghost @@ -57,7 +57,7 @@ SET(INC ${PYTHON_INC} ) -SET(SRC +set(SRC GPG_Application.cpp GPG_Canvas.cpp GPG_ghost.cpp @@ -70,10 +70,10 @@ SET(SRC GPG_System.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -IF(WITH_CODEC_FFMPEG) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + add_definitions(-DWITH_FFMPEG) +endif() -BLENDERLIB_NOLIST(ge_player_ghost "${SRC}" "${INC}") +blenderlib_nolist(ge_player_ghost "${SRC}" "${INC}") diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index a7c8ad9d0dd..4931299a8e5 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../intern/string @@ -54,7 +54,7 @@ SET(INC ../../../extern/glew/include ) -SET(SRC +set(SRC BL_BlenderShader.cpp BL_Material.cpp BL_Shader.cpp @@ -200,22 +200,22 @@ SET(SRC BL_Texture.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +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_CODEC_FFMPEG) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + add_definitions(-DWITH_FFMPEG) +endif() -IF(WITH_BULLET) - ADD_DEFINITIONS(-DUSE_BULLET) - LIST(APPEND INC ../../../extern/bullet2/src) - LIST(APPEND INC ../../../source/gameengine/Physics/Bullet ) -ENDIF(WITH_BULLET) +if(WITH_BULLET) + add_definitions(-DUSE_BULLET) + list(APPEND INC ../../../extern/bullet2/src) + list(APPEND INC ../../../source/gameengine/Physics/Bullet ) +endif() -BLENDERLIB(ge_logic_ketsji "${SRC}" "${INC}") +blenderlib(ge_logic_ketsji "${SRC}" "${INC}") diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt index 687f19b9022..a88fe0c5252 100644 --- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt +++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../../source/kernel/gen_system ../../../../intern/string @@ -36,7 +36,7 @@ SET(INC ../../../../source/gameengine/Network ) -SET(SRC +set(SRC KX_NetworkEventManager.cpp KX_NetworkMessageActuator.cpp KX_NetworkMessageSensor.cpp @@ -50,4 +50,4 @@ SET(SRC KX_NetworkObjectSensor.h ) -BLENDERLIB(ge_logic_network "${SRC}" "${INC}") +blenderlib(ge_logic_network "${SRC}" "${INC}") diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt index c337d6f48cb..dd64f0e8437 100644 --- a/source/gameengine/Network/CMakeLists.txt +++ b/source/gameengine/Network/CMakeLists.txt @@ -24,14 +24,14 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../intern/string ../../../intern/moto/include ) -SET(SRC +set(SRC NG_NetworkMessage.cpp NG_NetworkObject.cpp NG_NetworkScene.cpp @@ -42,4 +42,4 @@ SET(SRC NG_NetworkScene.h ) -BLENDERLIB(ge_logic_ngnetwork "${SRC}" "${INC}") +blenderlib(ge_logic_ngnetwork "${SRC}" "${INC}") diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt index e7a170fef98..b26a87666dc 100644 --- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt +++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt @@ -24,17 +24,17 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../../source/kernel/gen_system ../../../../intern/string ../../../../source/gameengine/Network ) -SET(SRC +set(SRC NG_LoopBackNetworkDeviceInterface.cpp NG_LoopBackNetworkDeviceInterface.h ) -BLENDERLIB(ge_logic_loopbacknetwork "${SRC}" "${INC}") +blenderlib(ge_logic_loopbacknetwork "${SRC}" "${INC}") diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt index 7a48c774cb9..da585803783 100644 --- a/source/gameengine/Physics/Bullet/CMakeLists.txt +++ b/source/gameengine/Physics/Bullet/CMakeLists.txt @@ -25,9 +25,9 @@ # ***** END GPL LICENSE BLOCK ***** # since this includes bullet we get errors from the headers too -REMOVE_STRICT_FLAGS() +remove_strict_flags() -SET(INC +set(INC . ../common ../../../../extern/bullet2/src @@ -47,7 +47,7 @@ SET(INC ${PYTHON_INC} ) -SET(SRC +set(SRC CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp CcdGraphicController.cpp @@ -57,8 +57,8 @@ SET(SRC CcdPhysicsEnvironment.h ) -IF(WITH_BULLET) - ADD_DEFINITIONS(-DUSE_BULLET) -ENDIF(WITH_BULLET) +if(WITH_BULLET) + add_definitions(-DUSE_BULLET) +endif() -BLENDERLIB(ge_phys_bullet "${SRC}" "${INC}") +blenderlib(ge_phys_bullet "${SRC}" "${INC}") diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt index 0e852f50c76..ab633b807e0 100644 --- a/source/gameengine/Physics/Dummy/CMakeLists.txt +++ b/source/gameengine/Physics/Dummy/CMakeLists.txt @@ -24,15 +24,15 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../common ) -SET(SRC +set(SRC DummyPhysicsEnvironment.cpp DummyPhysicsEnvironment.h ) -BLENDERLIB(ge_phys_dummy "${SRC}" "${INC}") +blenderlib(ge_phys_dummy "${SRC}" "${INC}") diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt index aacb497674d..bc095822936 100644 --- a/source/gameengine/Physics/common/CMakeLists.txt +++ b/source/gameengine/Physics/common/CMakeLists.txt @@ -24,12 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../Dummy ) -SET(SRC +set(SRC PHY_IMotionState.cpp PHY_IController.cpp PHY_IPhysicsController.cpp @@ -47,4 +47,4 @@ SET(SRC PHY_Pro.h ) -BLENDERLIB(ge_phys_common "${SRC}" "${INC}") +blenderlib(ge_phys_common "${SRC}" "${INC}") diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt index 7aeeafc5aa1..6971c74b55a 100644 --- a/source/gameengine/Rasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../source/blender/makesdna @@ -38,7 +38,7 @@ SET(INC ${PYTHON_INC} ) -SET(SRC +set(SRC RAS_2DFilterManager.cpp RAS_BucketManager.cpp RAS_FramingManager.cpp @@ -79,6 +79,6 @@ SET(SRC RAS_OpenGLFilters/RAS_Sobel2DFilter.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -BLENDERLIB(ge_rasterizer "${SRC}" "${INC}") +blenderlib(ge_rasterizer "${SRC}" "${INC}") diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt index bf0f979accf..ebdfb667443 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../../../../source/kernel/gen_system ../../../../intern/string ../../../../intern/moto/include @@ -39,7 +39,7 @@ SET(INC ../../../../source/blender/blenloader ) -SET(SRC +set(SRC RAS_GLExtensionManager.cpp RAS_ListRasterizer.cpp RAS_OpenGLRasterizer.cpp @@ -51,6 +51,6 @@ SET(SRC RAS_VAOpenGLRasterizer.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -BLENDERLIB(ge_oglrasterizer "${SRC}" "${INC}") +blenderlib(ge_oglrasterizer "${SRC}" "${INC}") diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt index 72472cb9a23..6c133af09f7 100644 --- a/source/gameengine/SceneGraph/CMakeLists.txt +++ b/source/gameengine/SceneGraph/CMakeLists.txt @@ -24,12 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../intern/moto/include ) -SET(SRC +set(SRC SG_BBox.cpp SG_Controller.cpp SG_IObject.cpp @@ -48,4 +48,4 @@ SET(SRC SG_Tree.h ) -BLENDERLIB(ge_scenegraph "${SRC}" "${INC}") +blenderlib(ge_scenegraph "${SRC}" "${INC}") diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt index 10c9bf3755a..fff9ff95c25 100644 --- a/source/gameengine/VideoTexture/CMakeLists.txt +++ b/source/gameengine/VideoTexture/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../../../source/gameengine/Ketsji ../../../source/gameengine/Expressions @@ -48,7 +48,7 @@ SET(INC ../../../extern/glew/include ) -SET(SRC +set(SRC Exception.cpp FilterBase.cpp FilterBlueScreen.cpp @@ -85,10 +85,10 @@ SET(SRC VideoFFmpeg.h ) -IF(WITH_CODEC_FFMPEG) - SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC}) - ADD_DEFINITIONS(-DWITH_FFMPEG) - ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS) -ENDIF(WITH_CODEC_FFMPEG) +if(WITH_CODEC_FFMPEG) + set(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC}) + add_definitions(-DWITH_FFMPEG) + add_definitions(-D__STDC_CONSTANT_MACROS) +endif() -BLENDERLIB(ge_videotex "${SRC}" "${INC}") +blenderlib(ge_videotex "${SRC}" "${INC}") |