diff options
author | Kent Mein <mein@cs.umn.edu> | 2007-03-27 22:34:57 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2007-03-27 22:34:57 +0400 |
commit | 80237ceff9c7218c55983e26c5d9518d0230e555 (patch) | |
tree | 9641b38ada64dddb618ccfe58b489460f0951034 /source/blender | |
parent | 0d19c13c931691b3ce84a7372c944e9a296dde56 (diff) |
patch to get cmake working with nodes now. Provided by Genscher.
I still have linking issues with it but it is better as is so I'm
commiting it. Hopefully will have it fixed fully shortly.
Kent
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 75 | ||||
-rw-r--r-- | source/blender/src/CMakeLists.txt | 1 |
4 files changed, 78 insertions, 1 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 24f81cfa907..fa9199006a8 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -27,7 +27,7 @@ # # ***** END GPL/BL DUAL LICENSE BLOCK ***** -SUBDIRS(avi blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray) +SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray) IF(WITH_INTERNATIONAL) SUBDIRS(ftfont) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index ac188003a4b..b8c23a6517d 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -34,6 +34,7 @@ SET(INC ../python ../render/extern/include ../../../intern/decimation/extern ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/iksolver/extern ../blenloader ../quicktime + ../nodes ${SDL_INC} ${ZLIB_INC} ) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt new file mode 100644 index 00000000000..d3e144726b1 --- /dev/null +++ b/source/blender/nodes/CMakeLists.txt @@ -0,0 +1,75 @@ +# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. The Blender +# Foundation also sells licenses for use in proprietary software under +# the Blender License. See http://www.blender.org/BL/ for information +# about this. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2006, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Jacques Beaurain. +# +# ***** END GPL/BL DUAL LICENSE BLOCK ***** + +FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c) + +SET(INC + . ../../../intern/guardedalloc ../include ../blenlib ../makesdna + ../python ../render/extern/include ../../../intern/decimation/extern + ../imbuf ../avi ../../../intern/elbeem/extern + ../../../intern/iksolver/extern ../blenloader ../quicktime + ../blenkernel + ${SDL_INC} + ${ZLIB_INC} +) + +IF(WITH_VERSE) + ADD_DEFINITIONS(-DWITH_VERSE) + SET(INC ${INC} ${VERSE_INC}) +ENDIF(WITH_VERSE) + +IF(WITH_OPENEXR) + ADD_DEFINITIONS(-DWITH_OPENEXR) +ENDIF(WITH_OPENEXR) + +IF(WITH_QUICKTIME) + SET(INC ${INC} ${QUICKTIME_INC}) + ADD_DEFINITIONS(-DWITH_QUICKTIME) +ENDIF(WITH_QUICKTIME) + +IF(WITH_FFMPEG) + SET(INC ${INC} ${FFMPEG_INC}) + ADD_DEFINITIONS(-DWITH_FFMPEG) +ENDIF(WITH_FFMPEG) + +IF(WITH_PLAYER) + SUBDIRS(bad_level_call_stubs) +ENDIF(WITH_PLAYER) + +ADD_DEFINITIONS(-DWITH_CCGSUBSURF) + +BLENDERLIB(bf_nodes "${SRC}" "${INC}") + +IF(WITH_VERSE) + ADD_DEPENDENCIES(bf_nodes mkprot verse) +ENDIF(WITH_VERSE) + +IF(WITH_INTERNATIONAL) + ADD_DEFINITIONS(-DWITH_FREETYPE2) +ENDIF(WITH_INTERNATIONAL) + diff --git a/source/blender/src/CMakeLists.txt b/source/blender/src/CMakeLists.txt index 7624531daac..d4a0cbf7c3d 100644 --- a/source/blender/src/CMakeLists.txt +++ b/source/blender/src/CMakeLists.txt @@ -38,6 +38,7 @@ SET(INC ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue ../quicktime ../../../intern/elbeem/extern ../../../intern/ghost ../../../intern/opennl/extern + ../nodes ${PYTHON_INC} ${SDL_INC} ) |