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/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/render/CMakeLists.txt')
-rw-r--r--source/blender/render/CMakeLists.txt38
1 files changed, 36 insertions, 2 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 0be9796fabd..dac495bb4c8 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -76,16 +76,50 @@ SET(SRC
intern/source/volumetric.c
intern/source/voxeldata.c
intern/source/zbuf.c
+
+ extern/include/RE_pipeline.h
+ extern/include/RE_raytrace.h
+ extern/include/RE_render_ext.h
+ extern/include/RE_shader_ext.h
+ intern/include/envmap.h
+ intern/include/gammaCorrectionTables.h
+ intern/include/initrender.h
+ intern/include/occlusion.h
+ intern/include/pixelblending.h
+ intern/include/pixelshading.h
+ intern/include/pointdensity.h
+ intern/include/raycounter.h
+ intern/include/rayobject.h
+ intern/include/render_types.h
+ intern/include/rendercore.h
+ intern/include/renderdatabase.h
+ intern/include/renderpipeline.h
+ intern/include/shadbuf.h
+ intern/include/shading.h
+ intern/include/sss.h
+ intern/include/strand.h
+ intern/include/sunsky.h
+ intern/include/texture.h
+ intern/include/volume_precache.h
+ intern/include/volumetric.h
+ intern/include/voxeldata.h
+ intern/include/zbuf.h
+ intern/raytrace/bvh.h
+ intern/raytrace/rayobject_hint.h
+ intern/raytrace/rayobject_rtbuild.h
+ intern/raytrace/reorganize.h
+ intern/raytrace/svbvh.h
+ intern/raytrace/vbvh.h
)
IF(WITH_IMAGE_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_IMAGE_OPENEXR)
-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(APPLE)
IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")