diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-09 12:46:02 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-09 12:46:02 +0400 |
| commit | 49bc31067163474729755c8a9dbd543ba3744d3f (patch) | |
| tree | f827273ee51caa8f7bf136f749b6bd4ac9f3dca2 /extern/libmv/bundle.sh | |
| parent | 22a30f78f2d7928095d8158f3c54d726771ba24d (diff) | |
Move guarded objetc allocation to a guardedalloc header
Also made libmv-capi use guarded objetc allocation.
Run into some suspecious cases when it was not so
clear whether memory is being freed or not.
Now we'll know for sure whether there're leaks or not :)
Having this macros in a guardedalloc header helps
using them in other areas (for now it's OCIO and libmv,
but in the future it'll be more places).
Diffstat (limited to 'extern/libmv/bundle.sh')
| -rwxr-xr-x | extern/libmv/bundle.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 16fb754d30a..f51af8ee32e 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -133,6 +133,8 @@ set(SRC if(WITH_LIBMV) add_definitions( -DWITH_LIBMV + -DWITH_LIBMV_GUARDED_ALLOC + -DGOOGLE_GLOG_DLL_DECL= ) list(APPEND INC @@ -203,10 +205,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 +236,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'] |