1 files changed, 1 insertions, 66 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index ac4190041bd..e9fb33e5930 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -18,7 +18,7 @@ git --git-dir $tmp/libmv/.git --work-tree $tmp/libmv log -n 50 > ChangeLog
 
 find libmv -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
 find third_party -type f -not -iwholename '*.svn*' -not -iwholename '*third_party/ceres*' \
-    -not -iwholename '*third_party/SConscript*' -not -iwholename '*third_party/CMakeLists.txt*' \
+    -not -iwholename '*third_party/CMakeLists.txt*' \
     -exec rm -rf {} \;
 
 cat "files.txt" | while read f; do
@@ -277,68 +277,3 @@ ${third_glog_headers}
 	blender_add_lib(extern_glog "\${GLOG_SRC}" "\${INC}" "\${INC_SYS}")
 endif()
 EOF
-
-cat > SConscript << EOF
-# NOTE: This file is automatically generated by bundle.sh script
-#       If you're doing changes in this file, please update template
-#       in that script too
-
-import sys
-import os
-
-Import('env')
-
-defs = []
-incs = '.'
-
-if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']):
-    defs.append('GOOGLE_GLOG_DLL_DECL=')
-    defs.append('WITH_LIBMV_GUARDED_ALLOC')
-    defs.append('LIBMV_NO_FAST_DETECTOR')
-
-    incs += ' ../Eigen3 third_party/gflags third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'
-    incs += ' ' + env['BF_PNG_INC']
-    incs += ' ' + env['BF_ZLIB_INC']
-
-    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-        incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-        if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-            incs += ' ./third_party/msinttypes'
-    else:
-        incs += ' ./third_party/glog/src'
-
-if env['WITH_BF_LIBMV']:
-    if not env['WITH_SHARED_PTR_SUPPORT']:
-        print("-- Unable to find shared_ptr which is required for compilation.")
-        exit(1)
-
-    if env['SHARED_PTR_HEADER'] == 'tr1/memory':
-        defs.append('CERES_TR1_MEMORY_HEADER')
-    if env['SHARED_PTR_NAMESPACE'] == 'std::tr1':
-        defs.append('CERES_TR1_SHARED_PTR')
-
-    src = env.Glob('intern/*.cc')
-    src.remove('intern' + os.sep + 'stub.cc')
-$src
-else:
-    src = env.Glob("intern/stub.cc")
-
-src = [src for src in src if src.find('_test.cc') == -1]
-
-env.BlenderLib(libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-
-if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']):
-    glog_src = []
-    glog_src += env.Glob("third_party/gflags/*.cc")
-    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-        glog_src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc']
-        glog_src += ['./third_party/glog/src/windows/port.cc']
-    else:
-        glog_src.remove('third_party/gflags/windows_port.cc')
-        glog_src += env.Glob("third_party/glog/src/*.cc")
-
-    env.BlenderLib(libname = 'extern_glog', sources=glog_src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-
-if env['WITH_BF_LIBMV']:
-    SConscript(['third_party/SConscript'])
-EOF