Merged changes in the trunk up to revision 32684.

1 files changed, 37 insertions, 3 deletions

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 5085a371688..10a6d891e42 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -25,9 +25,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 # remove warning until render branch merged.
-STRING(REGEX REPLACE "-Wunused-parameter" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-
-FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp)
+REMOVE_STRICT_FLAGS()
 
 SET(INC 
 	intern/include
@@ -45,6 +43,42 @@ SET(INC
 	../freestyle
 )
 
+SET(SRC
+	intern/raytrace/rayobject.cpp
+	intern/raytrace/rayobject_qbvh.cpp
+	intern/raytrace/rayobject_rtbuild.cpp
+	intern/raytrace/rayobject_svbvh.cpp
+	intern/raytrace/rayobject_vbvh.cpp
+	intern/source/convertblender.c
+	intern/source/envmap.c
+	intern/source/gammaCorrectionTables.c
+	intern/source/imagetexture.c
+	intern/source/initrender.c
+	intern/source/occlusion.c
+	intern/source/pipeline.c
+	intern/source/pixelblending.c
+	intern/source/pixelshading.c
+	intern/source/pointdensity.c
+	intern/source/rayobject_blibvh.c
+	intern/source/rayobject_instance.c
+	intern/source/rayobject_octree.c
+	intern/source/rayobject_raycounter.c
+	intern/source/rayshade.c
+	intern/source/rendercore.c
+	intern/source/renderdatabase.c
+	intern/source/shadbuf.c
+	intern/source/shadeinput.c
+	intern/source/shadeoutput.c
+	intern/source/sss.c
+	intern/source/strand.c
+	intern/source/sunsky.c
+	intern/source/texture.c
+	intern/source/volume_precache.c
+	intern/source/volumetric.c
+	intern/source/voxeldata.c
+	intern/source/zbuf.c
+)
+
 IF(WIN32)
 	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)