diff options
Diffstat (limited to 'extern/libmv/bundle.sh')
| -rwxr-xr-x | extern/libmv/bundle.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 16fb754d30a..57e3598a5ae 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -128,15 +128,19 @@ set(INC set(SRC libmv-capi.h + libmv-capi_intern.h ) if(WITH_LIBMV) add_definitions( -DWITH_LIBMV + -DWITH_LIBMV_GUARDED_ALLOC + -DGOOGLE_GLOG_DLL_DECL= ) list(APPEND INC third_party/ceres/include + ../../intern/guardedalloc ) set(INC_SYS @@ -203,10 +207,6 @@ ${third_glog_headers} third_party/glog/src ) endif() - - add_definitions( - -DGOOGLE_GLOG_DLL_DECL= - ) else() list(APPEND SRC libmv-capi_stub.cc @@ -238,11 +238,12 @@ incs = '.' if env['WITH_BF_LIBMV']: defs.append('GOOGLE_GLOG_DLL_DECL=') defs.append('WITH_LIBMV') + defs.append('WITH_LIBMV_GUARDED_ALLOC') src = env.Glob("libmv-capi.cc") $src - incs += ' ../Eigen3 third_party/ceres/include' + incs += ' ../Eigen3 third_party/ceres/include ../../intern/guardedalloc' incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_ZLIB_INC'] |