diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2009-10-07 07:47:36 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2009-10-07 07:47:36 +0400 |
commit | 043233943c4d48d2d59bcef18a31c47dfc9031df (patch) | |
tree | 3607b23e83be30f712d01601aedde00ba2ce98cd /source/blender/render/CMakeLists.txt | |
parent | 6d67e48f2aaf7d7a6b5ec17def7250fea321cc22 (diff) | |
parent | a8b82a49ad41491640d390405cf8e8c8c4c05829 (diff) |
merged changed to revision 23673
Diffstat (limited to 'source/blender/render/CMakeLists.txt')
-rw-r--r-- | source/blender/render/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 684bd5de382..bc355f33264 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/source/*.c) +FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp) SET(INC intern/include ../../../intern/guardedalloc ../blenlib ../makesdna @@ -47,10 +47,6 @@ IF(WITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) -IF(WITH_FFMPEG) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) - #TODO #if env['OURPLATFORM']=='linux2': # cflags='-pthread' |