diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 06:57:28 +0400 |
| commit | cb890a49fbd653c71d2fe639265a1a562136113f (patch) | |
| tree | 10ddd1f7198c85408f83794fe560caa9512e2a2e /source/creator | |
| parent | aea95c78606a99b0fa9c4c29c9e922e4a03f2a69 (diff) | |
| parent | f086201518b85f6dd2ae60ae37dc14f1d1406c01 (diff) | |
svn merge ^/trunk/blender -r41602:41638 .
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | source/creator/creator.c | 12 |
2 files changed, 34 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 1be424d93aa..c1fee1c1642 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) @@ -570,6 +575,14 @@ elseif(WIN32) DESTINATION ${TARGETDIR} ) + if(WITH_OPENIMAGEIO) + install( + FILES + ${LIBDIR}/openimageio/bin/OpenImageIO.dll + DESTINATION ${TARGETDIR} + ) + endif() + elseif(APPLE) set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist) @@ -715,6 +728,9 @@ elseif(APPLE) endif() endif() +# install more files specified elsewhere +delayed_do_install(${TARGETDIR_VER}) + unset(BLENDER_TEXT_FILES) @@ -758,6 +774,7 @@ endif() bf_editor_space_time bf_editor_space_userpref bf_editor_space_view3d + bf_editor_space_clip bf_editor_text bf_editor_transform @@ -816,6 +833,7 @@ endif() extern_minilzo extern_lzma extern_colamd + extern_libmv ge_logic_ketsji extern_recastnavigation ge_phys_common @@ -839,6 +857,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 c9b8b82054a..7e9e433598b 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -122,6 +122,10 @@ #include "binreloc.h" #endif +#ifdef WITH_LIBMV +#include "libmv-capi.h" +#endif + static int no_handler = 0; // from buildinfo.c @@ -382,6 +386,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; } @@ -1162,6 +1170,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?) */ |