1 files changed, 89 insertions, 20 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 8e0dbb457e8..4a3a73e7467 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -24,9 +24,10 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp)
+# remove warning until render branch merged.
+remove_strict_flags()
 
-SET(INC 
+set(INC 
 	intern/include
 	extern/include
 	../blenlib
@@ -35,30 +36,98 @@ SET(INC
 	../makesrna
 	../blenkernel
 	../imbuf
-	../include
 	../../kernel/gen_messaging
 	../../../intern/smoke/extern
 	../../../intern/guardedalloc
 )
 
-IF(WIN32)
-	LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
+set(SRC
+	intern/raytrace/rayobject.cpp
+	intern/raytrace/rayobject_empty.cpp
+	intern/raytrace/rayobject_octree.cpp
+	intern/raytrace/rayobject_raycounter.cpp
+	intern/raytrace/rayobject_svbvh.cpp
+	intern/raytrace/rayobject_blibvh.cpp
+	intern/raytrace/rayobject_instance.cpp
+	intern/raytrace/rayobject_qbvh.cpp
+	intern/raytrace/rayobject_rtbuild.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/rayshade.c
+	intern/source/rendercore.c
+	intern/source/render_texture.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/volume_precache.c
+	intern/source/volumetric.c
+	intern/source/voxeldata.c
+	intern/source/zbuf.c
 
-IF(WITH_IMAGE_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_IMAGE_OPENEXR)
+	extern/include/RE_pipeline.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/rayintersection.h
+	intern/include/raycounter.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_internal.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()
 
-IF(WITH_QUICKTIME)
-	LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
-	ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
+if(WITH_CODEC_QUICKTIME)
+	list(APPEND INC ../quicktime ${QUICKTIME_INC})
+	add_definitions(-DWITH_QUICKTIME)
+endif()
 
-IF(APPLE)
-	IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
-		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
-	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-ENDIF(APPLE)
+if(APPLE)
+	if(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
+	endif()
+endif()
 
-BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}")
+blender_add_lib_nolist(bf_render "${SRC}" "${INC}")