From 1bdf652b89871614c38bf2146cf94522c3347e06 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 22 Oct 2011 16:24:28 +0000 Subject: Code refactoring: move external engine functions into own file. --- source/blender/render/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/render/CMakeLists.txt') diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 90aef816e2c..e2222cad2ea 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -56,6 +56,7 @@ set(SRC intern/raytrace/rayobject_vbvh.cpp intern/source/convertblender.c intern/source/envmap.c + intern/source/external_engine.c intern/source/gammaCorrectionTables.c intern/source/imagetexture.c intern/source/initrender.c @@ -79,6 +80,7 @@ set(SRC intern/source/voxeldata.c intern/source/zbuf.c + extern/include/RE_engine.h extern/include/RE_pipeline.h extern/include/RE_render_ext.h extern/include/RE_shader_ext.h -- cgit v1.2.3 From 29f279e43dfac8e1e08dbe272d7092eab5a8067d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 22 Oct 2011 17:01:54 +0000 Subject: Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module. --- source/blender/render/CMakeLists.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'source/blender/render/CMakeLists.txt') diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index e2222cad2ea..d5b3bd5e311 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -118,6 +118,17 @@ set(SRC intern/raytrace/vbvh.h ) +if(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) + list(APPEND INC + ../python + ) + + list(APPEND INC_SYS + ${PYTHON_INCLUDE_DIRS} + ) +endif() + if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() @@ -136,6 +147,10 @@ if(WITH_CODEC_QUICKTIME) add_definitions(-DWITH_QUICKTIME) endif() +if(WITH_GAMEENGINE) + add_definitions(-DWITH_GAMEENGINE) +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") -- cgit v1.2.3