Merging r41246 through r41535 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index 1b98dd9..cb57e87 100644 (file)
@@ -110,6 +110,7 @@ set(SRC
        intern/mesh.c
        intern/mesh_validate.c
        intern/modifier.c
+       intern/movieclip.c
        intern/multires.c
        intern/nla.c
        intern/node.c
@@ -138,6 +139,7 @@ set(SRC
        intern/suggestions.c
        intern/text.c
        intern/texture.c
+       intern/tracking.c
        intern/unit.c
        intern/world.c
        intern/writeavi.c
@@ -192,6 +194,7 @@ set(SRC
        BKE_mball.h
        BKE_mesh.h
        BKE_modifier.h
+       BKE_movieclip.h
        BKE_multires.h
        BKE_nla.h
        BKE_node.h
@@ -218,6 +221,7 @@ set(SRC
        BKE_suggestions.h
        BKE_text.h
        BKE_texture.h
+       BKE_tracking.h
        BKE_unit.h
        BKE_utildefines.h
        BKE_world.h
@@ -349,6 +353,7 @@ if(WITH_LZMA)
        add_definitions(-DWITH_LZMA)
 endif()
 
+
 if(WITH_GAMEENGINE)
        list(APPEND INC_SYS
                ../../../extern/recastnavigation
@@ -361,6 +366,11 @@ if(WITH_GAMEENGINE)
        add_definitions(-DWITH_GAMEENGINE)
 endif()
 
+if(WITH_LIBMV)
+       list(APPEND INC ../../../extern/libmv)
+       add_definitions(-DWITH_LIBMV)
+endif()
+
 ## Warnings as errors, this is too strict!
 #if(MSVC)
 #      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")