diff options
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/CMakeLists.txt | 11 | ||||
-rw-r--r-- | source/creator/creator.c | 12 |
2 files changed, 23 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 867ea37e0a1..a633a139995 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -68,6 +68,11 @@ if(WITH_IMAGE_HDR) add_definitions(-DWITH_HDR) endif() +if(WITH_LIBMV) + blender_include_dirs(../../extern/libmv) + add_definitions(-DWITH_LIBMV) +endif() + if(WITH_PYTHON) blender_include_dirs(../blender/python) add_definitions(-DWITH_PYTHON) @@ -758,6 +763,7 @@ endif() bf_editor_space_time bf_editor_space_userpref bf_editor_space_view3d + bf_editor_space_clip bf_editor_text bf_editor_transform @@ -815,6 +821,7 @@ endif() extern_minilzo extern_lzma extern_colamd + extern_libmv ge_logic_ketsji extern_recastnavigation ge_phys_common @@ -838,6 +845,10 @@ endif() bf_intern_mikktspace ) + if(WITH_LIBMV) + list(APPEND BLENDER_SORTED_LIBS extern_libmv) + endif() + if(WITH_MOD_CLOTH_ELTOPO) list(APPEND BLENDER_SORTED_LIBS extern_eltopo) endif() diff --git a/source/creator/creator.c b/source/creator/creator.c index 39ea82f141f..1f6f4d85f43 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -120,6 +120,10 @@ #include "binreloc.h" #endif +#ifdef WITH_LIBMV +#include "libmv-capi.h" +#endif + // from buildinfo.c #ifdef BUILD_DATE extern char build_date[]; @@ -352,6 +356,10 @@ static int debug_mode(int UNUSED(argc), const char **UNUSED(argv), void *data) printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type); #endif // WITH_BUILDINFO +#ifdef WITH_LIBMV + libmv_startDebugLogging(); +#endif + BLI_argsPrint(data); return 0; } @@ -1132,6 +1140,10 @@ int main(int argc, const char **argv) br_init( NULL ); #endif +#ifdef WITH_LIBMV + libmv_initLogging(argv[0]); +#endif + setCallbacks(); #ifdef __APPLE__ /* patch to ignore argument finder gives us (pid?) */ |