diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/blender/CMakeLists.txt | |
parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'source/blender/CMakeLists.txt')
-rw-r--r-- | source/blender/CMakeLists.txt | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index e2add807ae4..703c5acd8a2 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -24,20 +24,36 @@ # # ***** END GPL LICENSE BLOCK ***** -SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna python radiosity readblenfile render src yafray freestyle) - -IF(WITH_INTERNATIONAL) - SUBDIRS(ftfont) -ENDIF(WITH_INTERNATIONAL) +ADD_SUBDIRECTORY(windowmanager) +ADD_SUBDIRECTORY(editors) +ADD_SUBDIRECTORY(avi) +ADD_SUBDIRECTORY(nodes) +ADD_SUBDIRECTORY(blenkernel) +ADD_SUBDIRECTORY(blenlib) +ADD_SUBDIRECTORY(blenloader) +ADD_SUBDIRECTORY(blenpluginapi) +ADD_SUBDIRECTORY(imbuf) +ADD_SUBDIRECTORY(imbuf/intern/cineon) +ADD_SUBDIRECTORY(gpu) +ADD_SUBDIRECTORY(makesdna) +ADD_SUBDIRECTORY(makesrna) +ADD_SUBDIRECTORY(readblenfile) +ADD_SUBDIRECTORY(render) +ADD_SUBDIRECTORY(blenfont) IF(WITH_OPENEXR) - SUBDIRS(imbuf/intern/openexr) + ADD_SUBDIRECTORY(imbuf/intern/openexr) ENDIF(WITH_OPENEXR) IF(WITH_DDS) - SUBDIRS(imbuf/intern/dds) + ADD_SUBDIRECTORY(imbuf/intern/dds) ENDIF(WITH_DDS) IF(WITH_QUICKTIME) - SUBDIRS(quicktime) + ADD_SUBDIRECTORY(quicktime) ENDIF(WITH_QUICKTIME) + +IF(WITH_PYTHON) + ADD_SUBDIRECTORY(python) +ENDIF(WITH_PYTHON) + |