diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
| commit | c8b4cf92067ffeb625aa39003baf5d8f7c3f0025 (patch) | |
| tree | c6c50dbc3d90a65fca6c1ca56a93e4a57cf7e154 /source/gameengine/CMakeLists.txt | |
| parent | e93db433a086a3e739c0f4026cd500f0b595b0f1 (diff) | |
| parent | d76a6f5231c015c35123d22e1f5c3ffcdfbf9bbd (diff) | |
2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD
Notes:
* Game and sequencer RNA, and sequencer header are now out of date
a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
not needed anymore.
* Fix "duplicate strip" always increase the user count for ipo.
* IPO pinning on sequencer strips was lost during Undo.
Diffstat (limited to 'source/gameengine/CMakeLists.txt')
| -rw-r--r-- | source/gameengine/CMakeLists.txt | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt index 3ea788791e2..fd05858710d 100644 --- a/source/gameengine/CMakeLists.txt +++ b/source/gameengine/CMakeLists.txt @@ -24,25 +24,23 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS( - BlenderRoutines - Converter - Expressions - GameLogic - Ketsji - Ketsji/KXNetwork - Network - Network/LoopBackNetwork - Physics/common - Physics/Dummy - Rasterizer - Rasterizer/RAS_OpenGLRasterizer - SceneGraph - Physics/Bullet - Physics/Sumo - VideoTexture -) +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(Physics/Bullet) +ADD_SUBDIRECTORY(Physics/Sumo) +ADD_SUBDIRECTORY(VideoTexture) IF(WITH_PLAYER) - SUBDIRS(GamePlayer) + ADD_SUBDIRECTORY(GamePlayer) ENDIF(WITH_PLAYER) |