diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-13 02:30:34 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-13 02:30:34 +0400 |
| commit | 4dba8307f2b613ade25be4117fd374575a27aab5 (patch) | |
| tree | eca2772c58c3e2dc21896efeacd25d625fc2391d /extern | |
| parent | 32faec1a53fdc557dd7c74465d9d1d0c0c17cdb0 (diff) | |
Compilation fix for recent commit.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/SConscript | 3 | ||||
| -rwxr-xr-x | extern/libmv/bundle.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index ec616ff2adf..f422eb08c58 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -10,6 +10,7 @@ import os Import('env') defs = [] +incs = '.' if env['WITH_BF_LIBMV']: defs.append('GOOGLE_GLOG_DLL_DECL=') @@ -24,7 +25,7 @@ if env['WITH_BF_LIBMV']: src += env.Glob('third_party/fast/*.c') src += env.Glob('third_party/gflags/*.cc') - incs = '. ../Eigen3 third_party/ceres/include' + incs += ' ../Eigen3 third_party/ceres/include' incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_ZLIB_INC'] diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 4a52cf2fd18..16fb754d30a 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -233,6 +233,7 @@ import os Import('env') defs = [] +incs = '.' if env['WITH_BF_LIBMV']: defs.append('GOOGLE_GLOG_DLL_DECL=') @@ -241,7 +242,7 @@ if env['WITH_BF_LIBMV']: src = env.Glob("libmv-capi.cc") $src - incs = '. ../Eigen3 third_party/ceres/include' + incs += ' ../Eigen3 third_party/ceres/include' incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_ZLIB_INC'] |