Merged changes in the trunk up to revision 41225.
[blender-staging.git] / source / blender / render / CMakeLists.txt
index 3fbc60f2c7fcd75f45c4278f459efa981a36a4cf..2919997af3f7ce8d9a0a36472870ad9e0ffbe6a8 100644 (file)
@@ -57,6 +57,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
@@ -80,6 +81,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
@@ -117,6 +119,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()
@@ -135,6 +148,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")