diff options
author | Matt Ebb <matt@mke3.net> | 2009-08-19 15:18:52 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2009-08-19 15:18:52 +0400 |
commit | 132277f0989b0b7d99d883d22a2bade6534ae44c (patch) | |
tree | 6d26c46f62749470130375061381353fd54c2364 /source/blender/render/CMakeLists.txt | |
parent | 8480ea2b0abacae00c90d37e7d99fa5e0c89eebe (diff) | |
parent | e611c4756fa17c57855123dc2b5c2c2408b0d790 (diff) |
svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Diffstat (limited to 'source/blender/render/CMakeLists.txt')
-rw-r--r-- | source/blender/render/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 4eb750262ec..ad96b9db166 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -28,8 +28,8 @@ FILE(GLOB SRC intern/source/*.c) SET(INC intern/include ../../../intern/guardedalloc ../blenlib ../makesdna - extern/include ../blenkernel ../radiosity/extern/include ../imbuf - ../quicktime ../include ../../kernel/gen_messaging ../blenloader + extern/include ../blenkernel ../imbuf + ../include ../../kernel/gen_messaging ../blenloader ../../../intern/smoke/extern ../makesrna ) @@ -39,7 +39,7 @@ IF(WITH_OPENEXR) ENDIF(WITH_OPENEXR) IF(WITH_QUICKTIME) - SET(INC ${INC} ${QUICKTIME_INC}) + SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) |