diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:03:11 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:26:25 +0400 |
| commit | 6ba5c0c2683bb7718dfceca3868d5f2c9e4795c1 (patch) | |
| tree | 11989e797939c41ba4b889ebcfe63456320a50cf /extern/libmv/bundle.sh | |
| parent | 2ea78fb28f5f90c736b6d048b5e1f1d787c48920 (diff) | |
Update Libmv to latest upstream
This is mainly a maintaince commit which syncs changes
between Blender and Libmv upstream also bringing new
GLog version.
This GLog version is presumably have better support of
MinGW from "the box".
This commit is also aimed to make further 3d part libs
update easier.
Diffstat (limited to 'extern/libmv/bundle.sh')
| -rwxr-xr-x | extern/libmv/bundle.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 48d68435ef7..c98f8a31045 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -132,6 +132,8 @@ if(WITH_LIBMV) ) list(APPEND INC + third_party/gflags + third_party/glog/src third_party/ceres/include ../../intern/guardedalloc ) @@ -195,10 +197,6 @@ ${third_glog_sources} ${third_glog_headers} ) - - list(APPEND INC - third_party/glog/src - ) endif() else() list(APPEND SRC @@ -237,7 +235,7 @@ if env['WITH_BF_LIBMV']: src = env.Glob("libmv-capi.cc") $src - incs += ' ../Eigen3 third_party/ceres/include ../../intern/guardedalloc' + incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include ../../intern/guardedalloc' incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_ZLIB_INC'] |