Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-12-06 04:23:18 +0300
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-12-06 04:23:18 +0300
commit8a2eb1f590c40cc9831d46d95434d9a63f31629b (patch)
tree7a0043da9546186d1a434c95485136ca600a654d /source/blender/editors/render/CMakeLists.txt
parentad608f30e019b0184ec626942a42ceba4e2e6487 (diff)
parent2f366d1544ecc5618d7190b779ccc75f2f144d0a (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.txt6
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)