diff options
Diffstat (limited to 'extern/libmv/bundle.sh')
| -rwxr-xr-x | extern/libmv/bundle.sh | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 0560ab0acd2..f352f77373b 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -7,7 +7,7 @@ else exit 1 fi -BRANCH="devel" +BRANCH="master" repo="git://git.blender.org/libmv.git" tmp=`mktemp -d` @@ -128,12 +128,10 @@ set(INC_SYS set(SRC libmv-capi.h - libmv-capi_intern.h ) if(WITH_LIBMV) add_definitions( - -DWITH_LIBMV -DWITH_LIBMV_GUARDED_ALLOC -DGOOGLE_GLOG_DLL_DECL= -DLIBMV_NO_FAST_DETECTOR= @@ -159,18 +157,32 @@ if(WITH_LIBMV) ../../intern/guardedalloc ) - set(INC_SYS + list(APPEND INC_SYS ../Eigen3 \${PNG_INCLUDE_DIR} \${ZLIB_INCLUDE_DIRS} ) list(APPEND SRC - libmv-capi.cc - libmv-util.cc + intern/camera_intrinsics.cc + intern/detector.cc + intern/homography.cc + intern/image.cc + intern/logging.cc + intern/reconstruction.cc + intern/track_region.cc + intern/tracks.cc ${sources} ${third_sources} - libmv-util.h + + intern/camera_intrinsics.h + intern/detector.h + intern/homography.h + intern/image.h + intern/logging.h + intern/reconstruction.h + intern/track_region.h + intern/tracks.h ${headers} ${third_headers} @@ -287,11 +299,11 @@ if env['WITH_BF_LIBMV']: defs.append('CERES_TR1_SHARED_PTR') defs.append('GOOGLE_GLOG_DLL_DECL=') - defs.append('WITH_LIBMV') defs.append('WITH_LIBMV_GUARDED_ALLOC') defs.append('LIBMV_NO_FAST_DETECTOR') - src = env.Glob('*.cc') + src = env.Glob('intern/*.cc') + src.remove('intern' + os.sep + 'stub.cc') $src incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc' @@ -309,7 +321,7 @@ ${win_src} src += env.Glob("third_party/glog/src/*.cc") incs += ' ./third_party/glog/src' else: - src = env.Glob("libmv-capi_stub.cc") + src = env.Glob("intern/stub.cc") src = [src for src in src if src.find('_test.cc') == -1] |