[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56731] trunk/blender/extern/libmv: Compilation fix for recent commit.
Sergey Sharybin
sergey.vfx at gmail.com
Mon May 13 00:30:34 CEST 2013
Revision: 56731
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56731
Author: nazgul
Date: 2013-05-12 22:30:34 +0000 (Sun, 12 May 2013)
Log Message:
-----------
Compilation fix for recent commit.
Modified Paths:
--------------
trunk/blender/extern/libmv/SConscript
trunk/blender/extern/libmv/bundle.sh
Modified: trunk/blender/extern/libmv/SConscript
===================================================================
--- trunk/blender/extern/libmv/SConscript 2013-05-12 22:27:39 UTC (rev 56730)
+++ trunk/blender/extern/libmv/SConscript 2013-05-12 22:30:34 UTC (rev 56731)
@@ -10,6 +10,7 @@
Import('env')
defs = []
+incs = '.'
if env['WITH_BF_LIBMV']:
defs.append('GOOGLE_GLOG_DLL_DECL=')
@@ -24,7 +25,7 @@
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']
Modified: trunk/blender/extern/libmv/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/bundle.sh 2013-05-12 22:27:39 UTC (rev 56730)
+++ trunk/blender/extern/libmv/bundle.sh 2013-05-12 22:30:34 UTC (rev 56731)
@@ -233,6 +233,7 @@
Import('env')
defs = []
+incs = '.'
if env['WITH_BF_LIBMV']:
defs.append('GOOGLE_GLOG_DLL_DECL=')
@@ -241,7 +242,7 @@
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']
More information about the Bf-blender-cvs
mailing list