diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-06 04:23:18 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-06 04:23:18 +0300 |
commit | 8a2eb1f590c40cc9831d46d95434d9a63f31629b (patch) | |
tree | 7a0043da9546186d1a434c95485136ca600a654d /source/blender/editors/render/CMakeLists.txt | |
parent | ad608f30e019b0184ec626942a42ceba4e2e6487 (diff) | |
parent | 2f366d1544ecc5618d7190b779ccc75f2f144d0a (diff) |
* Merged changes in the trunk up to revision 33492.
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
Diffstat (limited to 'source/blender/editors/render/CMakeLists.txt')
-rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index f022249b59f..87872055746 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -42,12 +42,14 @@ SET(SRC render_ops.c render_preview.c render_shading.c + + render_intern.h ) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_OPENMP) ADD_DEFINITIONS(-DPARALLEL=1) |