Merging r37594 through r37703 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index 9c06e325ce2a46c97f9e020901cc725d9b146745..e050d8a6d9e739244c0562344ce6d93cc489078f 100644 (file)
@@ -116,6 +116,8 @@ set(SRC
        intern/mesh.c
        intern/mesh_validate.c
        intern/modifier.c
+       intern/movieclip.c
+       intern/moviecache.c
        intern/multires.c
        intern/nla.c
        intern/node.c
@@ -143,6 +145,7 @@ set(SRC
        intern/suggestions.c
        intern/text.c
        intern/texture.c
+       intern/tracking.c
        intern/unit.c
        intern/world.c
        intern/writeavi.c
@@ -198,6 +201,8 @@ set(SRC
        BKE_mball.h
        BKE_mesh.h
        BKE_modifier.h
+       BKE_movieclip.h
+       BKE_moviecache.h
        BKE_multires.h
        BKE_nla.h
        BKE_node.h
@@ -223,6 +228,7 @@ set(SRC
        BKE_suggestions.h
        BKE_text.h
        BKE_texture.h
+       BKE_tracking.h
        BKE_unit.h
        BKE_utildefines.h
        BKE_world.h
@@ -314,6 +320,11 @@ if(WITH_LZMA)
        add_definitions(-DWITH_LZMA)
 endif()
 
+if(WITH_LIBMV)
+       list(APPEND INC ../../../extern/libmv)
+       add_definitions(-DWITH_LIBMV)
+endif()
+
 if(MSVC)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()