[Bf-blender-cvs] [58a9569] master: SCons: Don't compile libmv stub when libmv is actually enabled

[Sergey Sharybin]

Commit: 58a9569628c96ecf471c2ad42a73ae8ff6cd398c
Author: Sergey Sharybin
Date:   Fri Sep 26 14:28:04 2014 +0600
Branches: master
https://developer.blender.org/rB58a9569628c96ecf471c2ad42a73ae8ff6cd398c

SCons: Don't compile libmv stub when libmv is actually enabled

Really weird linux and windows didn't have duplicated symbols error.

===================================================================

M	extern/libmv/SConscript
M	extern/libmv/bundle.sh

===================================================================

diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index 857d7de..162fb88 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -28,6 +28,7 @@ if env['WITH_BF_LIBMV']:
     defs.append('LIBMV_NO_FAST_DETECTOR')
 
     src = env.Glob('intern/*.cc')
+    src.remove('intern' + os.sep + 'stub.cc')
     src += env.Glob('libmv/base/*.cc')
     src += env.Glob('libmv/image/*.cc')
     src += env.Glob('libmv/multiview/*.cc')
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index d394d2c..f37ab1f 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -307,6 +307,7 @@ if env['WITH_BF_LIBMV']:
     defs.append('LIBMV_NO_FAST_DETECTOR')
 
     src = env.Glob('intern/*.cc')
+    src.remove('intern' + os.sep + 'stub.cc')
 $src
 
     incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'