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/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/CMakeLists.txt')
| -rw-r--r-- | source/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 04566ec3b0b..4764caddf6a 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -24,12 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(blender kernel) +ADD_SUBDIRECTORY(blender) +ADD_SUBDIRECTORY(kernel) IF(WITH_GAMEENGINE) - SUBDIRS(gameengine) + ADD_SUBDIRECTORY(gameengine) ENDIF(WITH_GAMEENGINE) IF(WINDOWS) - SUBDIRS(icons) + ADD_SUBDIRECTORY(icons) ENDIF(WINDOWS) |