Compilation fix for recent commit.
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 May 2013 22:30:34 +0000 (22:30 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 May 2013 22:30:34 +0000 (22:30 +0000)
extern/libmv/SConscript
extern/libmv/bundle.sh

index ec616ff2adf878f14c3add99ffe8058a9d4d257e..f422eb08c5838946bac088e681401308756dafcf 100644 (file)
@@ -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']
 
index 4a52cf2fd189b97ff4d5838a3495173abc93543d..16fb754d30ab8f47fcaafd21ea68f9b95205988d 100755 (executable)
@@ -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']