1 files changed, 25 insertions, 36 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index e3c3cf712f9..d1f69ddfc02 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -20,8 +20,8 @@
 
 
 set(INC
-  extern/include
-  intern/include
+  .
+  intern
   ../blenkernel
   ../blenlib
   ../blentranslation
@@ -32,6 +32,7 @@ set(INC
   ../makesdna
   ../makesrna
   ../nodes
+  ../sequencer
   ../simulation
   ../../../intern/atomic
   ../../../intern/guardedalloc
@@ -39,34 +40,31 @@ set(INC
   ../../../intern/mantaflow/extern
 )
 
-set(INC_SYS
-  ${GLEW_INCLUDE_PATH}
-)
 
 set(SRC
-  intern/source/bake_api.c
-  intern/source/external_engine.c
-  intern/source/imagetexture.c
-  intern/source/initrender.c
-  intern/source/multires_bake.c
-  intern/source/pipeline.c
-  intern/source/pointdensity.c
-  intern/source/render_result.c
-  intern/source/render_texture.c
-  intern/source/zbuf.c
+  intern/bake.c
+  intern/engine.c
+  intern/initrender.c
+  intern/multires_bake.c
+  intern/pipeline.c
+  intern/render_result.c
+  intern/texture_image.c
+  intern/texture_pointdensity.c
+  intern/texture_procedural.c
+  intern/zbuf.c
+
+  RE_bake.h
+  RE_engine.h
+  RE_multires_bake.h
+  RE_pipeline.h
+  RE_texture.h
 
-  extern/include/RE_bake.h
-  extern/include/RE_engine.h
-  extern/include/RE_multires_bake.h
-  extern/include/RE_pipeline.h
-  extern/include/RE_render_ext.h
-  extern/include/RE_shader_ext.h
-  intern/include/initrender.h
-  intern/include/render_result.h
-  intern/include/render_types.h
-  intern/include/renderpipeline.h
-  intern/include/texture.h
-  intern/include/zbuf.h
+  intern/initrender.h
+  intern/render_result.h
+  intern/render_types.h
+  intern/pipeline.h
+  intern/texture_common.h
+  intern/zbuf.h
 )
 
 set(LIB
@@ -100,14 +98,5 @@ if(WITH_INTERNATIONAL)
   add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-if(APPLE)
-  # SSE math is enabled by default on x86_64
-  if(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
-  endif()
-endif()
-
-add_definitions(${GL_DEFINITIONS})
 
 blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")