23 files changed, 1 insertions, 666 deletions
diff --git a/extern/SConscript b/extern/SConscript
deleted file mode 100644
index a5d8c1f078e..00000000000
--- a/extern/SConscript
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/python
-
-Import('env')
-
-if env['WITH_BF_GLEW_ES']:
-    SConscript(['glew-es/SConscript'])
-else:
-    SConscript(['glew/SConscript'])
-
-SConscript(['rangetree/SConscript'])
-SConscript(['wcwidth/SConscript'])
-SConscript(['libmv/SConscript'])
-
-if env['WITH_BF_GAMEENGINE']:
-    SConscript(['recastnavigation/SConscript'])
-
-# now only available in a branch
-'''
-if env['WITH_BF_ELTOPO']:
-    SConscript(['eltopo/SConscript'])
-'''
-
-if env['WITH_BF_BULLET']:
-    SConscript(['bullet2/src/SConscript'])
-
-if env['WITH_BF_COMPOSITOR'] or env['WITH_BF_CYCLES'] or env['WITH_BF_OPENSUBDIV']:
-    SConscript (['clew/SConscript'])
-    SConscript (['cuew/SConscript'])
-
-if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
-    SConscript(['libopenjpeg/SConscript'])
-
-if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
-    SConscript(['libredcode/SConscript'])
-
-if env['WITH_BF_BINRELOC']:
-    SConscript(['binreloc/SConscript']);
-
-if env['WITH_BF_LZO']:
-    SConscript(['lzo/SConscript'])
-
-if env['WITH_BF_LZMA']:
-    SConscript(['lzma/SConscript'])
-
-if env['WITH_BF_BOOLEAN']:
-    SConscript(['carve/SConscript'])
-
-if env['WITH_GHOST_XDND']:
-    # FreeBSD doesn't seems to support XDND protocol
-    if env['OURPLATFORM'] in ('linux', 'openbsd3', 'sunos5', 'aix4', 'aix5'):
-        SConscript(['xdnd/SConscript'])
-
-if env['WITH_BF_SDL'] and env['WITH_BF_SDL_DYNLOAD']:
-    SConscript(['sdlew/SConscript'])
diff --git a/extern/binreloc/SConscript b/extern/binreloc/SConscript
deleted file mode 100644
index 331b70a4ebc..00000000000
--- a/extern/binreloc/SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-
-Import('env')
-defs = 'ENABLE_BINRELOC'
-cflags = []
-
-sources = ['binreloc.c']
-incs = 'include'
-
-env.BlenderLib ( 'extern_binreloc', sources, Split(incs), Split(defs), libtype=['extern','player'], priority=[36,225], compileflags = cflags)
-
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
deleted file mode 100644
index 20a87d5d12c..00000000000
--- a/extern/bullet2/src/SConscript
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-
-Import('env')
-
-defs = ''
-cflags = []
-
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    defs += ' WIN32 NDEBUG _WINDOWS'
-    #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
-    cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
-elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross', 'win64-mingw'):
-    defs += ' NDEBUG'
-    cflags += ['-O2']
-elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'):
-    defs += ' NDEBUG'
-    cflags += ['-O2']
-elif sys.platform=='darwin':
-    defs += ' NDEBUG'
-    cflags += ['-O3','-fPIC']
-
-bullet2_src = env.Glob("LinearMath/*.cpp")
-bullet2_src += env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
-bullet2_src += env.Glob("BulletCollision/CollisionDispatch/*.cpp")
-bullet2_src += env.Glob("BulletCollision/Gimpact/*.cpp")
-bullet2_src += env.Glob("BulletCollision/CollisionShapes/*.cpp")
-bullet2_src += env.Glob("BulletCollision/NarrowPhaseCollision/*.cpp")
-bullet2_src += env.Glob("BulletDynamics/Vehicle/*.cpp")
-bullet2_src += env.Glob("BulletDynamics/ConstraintSolver/*.cpp")
-bullet2_src += env.Glob("BulletDynamics/Dynamics/*.cpp")
-bullet2_src += env.Glob("BulletDynamics/Character/*.cpp")
-bullet2_src += env.Glob("BulletDynamics/Featherstone/*.cpp")
-bullet2_src += env.Glob("BulletDynamics/MLCPSolvers/*.cpp")
-bullet2_src += env.Glob("BulletSoftBody/*.cpp")
-
-incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
-
-env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )
diff --git a/extern/carve/SConscript b/extern/carve/SConscript
deleted file mode 100644
index e08e75e6640..00000000000
--- a/extern/carve/SConscript
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-# 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 ('env')
-
-sources = env.Glob('lib/*.cpp')
-sources += env.Glob('*.cc')
-
-defs = []
-incs = ['include']
-
-if env['WITH_BF_BOOST']:
-    if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
-        # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
-        if env['OURPLATFORM'] not in ('win32-mingw', 'win64-mingw'):
-            defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
-
-    defs.append('CARVE_SYSTEM_BOOST')
-    defs.append('HAVE_BOOST_LIBRARY')
-    incs.append(env['BF_BOOST_INC'])
-
-env.BlenderLib ('extern_carve', Split(sources), incs, defs, libtype=['extern'], priority=[40] )
diff --git a/extern/carve/bundle.sh b/extern/carve/bundle.sh
index dec902e30c0..00de08ea93c 100755
--- a/extern/carve/bundle.sh
+++ b/extern/carve/bundle.sh
@@ -103,29 +103,3 @@ endif()
 
 blender_add_lib(extern_carve "\${SRC}" "\${INC}" "\${INC_SYS}")
 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 ('env')
-
-sources = env.Glob('lib/*.cpp')
-sources += env.Glob('*.cc')
-
-defs = []
-incs = ['include']
-
-if env['WITH_BF_BOOST']:
-    if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
-        # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
-        if env['OURPLATFORM'] not in ('win32-mingw', 'win64-mingw'):
-            defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
-
-    defs.append('CARVE_SYSTEM_BOOST')
-    defs.append('HAVE_BOOST_LIBRARY')
-    incs.append(env['BF_BOOST_INC'])
-
-env.BlenderLib ('extern_carve', Split(sources), incs, defs, libtype=['extern'], priority=[40] )
-EOF
diff --git a/extern/clew/SConscript b/extern/clew/SConscript
deleted file mode 100644
index 14a03c7298e..00000000000
--- a/extern/clew/SConscript
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-#
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Nathan Letwory.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import ('env')
-
-sources = env.Glob('src/clew.c')
-
-incs = 'include'
-defs = ['CL_USE_DEPRECATED_OPENCL_1_1_APIS']
-
-env.BlenderLib ('extern_clew', sources, Split(incs), defines=defs, libtype=['system'], priority = [999])
diff --git a/extern/cuew/SConscript b/extern/cuew/SConscript
deleted file mode 100644
index 9c12c71133c..00000000000
--- a/extern/cuew/SConscript
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-#
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Nathan Letwory.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import ('env')
-
-sources = env.Glob('src/cuew.c')
-
-incs = 'include'
-defs = []
-
-env.BlenderLib ('extern_cuew', sources, Split(incs), defines=defs, libtype=['system'], priority = [0])
diff --git a/extern/glew-es/SConscript b/extern/glew-es/SConscript
deleted file mode 100644
index 7552ce84067..00000000000
--- a/extern/glew-es/SConscript
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-
-Import('env')
-
-sources = ['src/glew.c']
-
-defs = []
-defs += env['BF_GL_DEFINITIONS']
-
-if env['WITH_BF_GLEW_MX']:
-    defs += ['GLEW_MX']
-incs = ['include']
-
-env.BlenderLib ( 'extern_glew_es', sources, incs, defs, libtype=['extern','player'], priority=[50,230] )
diff --git a/extern/glew/SConscript b/extern/glew/SConscript
deleted file mode 100644
index a9687383a0c..00000000000
--- a/extern/glew/SConscript
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-
-Import('env')
-
-sources = ['src/glew.c']
-
-defs = []
-defs += env['BF_GL_DEFINITIONS']
-
-if env['WITH_BF_GLEW_MX']:
-    defs += ['GLEW_MX']
-
-incs = ['include']
-
-env.BlenderLib ( 'extern_glew', sources, incs, defs, libtype=['extern','player'], priority=[50,230] )
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
deleted file mode 100644
index c177f74c2b8..00000000000
--- a/extern/libmv/SConscript
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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 += env.Glob('libmv/autotrack/*.cc')
-    src += env.Glob('libmv/base/*.cc')
-    src += env.Glob('libmv/image/*.cc')
-    src += env.Glob('libmv/multiview/*.cc')
-    src += env.Glob('libmv/numeric/*.cc')
-    src += env.Glob('libmv/simple_pipeline/*.cc')
-    src += env.Glob('libmv/tracking/*.cc')
-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'])
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
diff --git a/extern/libmv/third_party/SConscript b/extern/libmv/third_party/SConscript
deleted file mode 100644
index b05692e385f..00000000000
--- a/extern/libmv/third_party/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-
-SConscript(['ceres/SConscript'])
diff --git a/extern/libmv/third_party/ceres/SConscript b/extern/libmv/third_party/ceres/SConscript
deleted file mode 100644
index 7b46083f386..00000000000
--- a/extern/libmv/third_party/ceres/SConscript
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-
-# 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')
-
-src = []
-defs = []
-
-src += env.Glob('internal/ceres/*.cc')
-if env['WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS']:
-    src += env.Glob('internal/ceres/generated/*.cc')
-else:
-    src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
-    src += env.Glob('internal/ceres/generated/partitioned_matrix_view_d_d_d.cc')
-    defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
-
-defs.append('CERES_HAVE_PTHREAD')
-defs.append('CERES_NO_SUITESPARSE')
-defs.append('CERES_NO_CXSPARSE')
-defs.append('CERES_NO_LAPACK')
-defs.append('CERES_HAVE_RWLOCK')
-
-if env['WITH_BF_OPENMP']:
-    defs.append('CERES_USE_OPENMP')
-
-if env['WITH_UNORDERED_MAP_SUPPORT']:
-    if env['UNORDERED_MAP_HEADER'] == 'unordered_map':
-        if env['UNORDERED_MAP_NAMESPACE'] == 'std':
-            defs.append('CERES_STD_UNORDERED_MAP')
-        elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-            defs.append('CERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE')
-    elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-        defs.append('CERES_TR1_UNORDERED_MAP')
-else:
-    print("-- Replacing unordered_map/set with map/set (warning: slower!)")
-    defs.append('CERES_NO_UNORDERED_MAP')
-
-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')
-
-incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config'
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-        incs += ' ../msinttypes'
-
-    incs += ' ../glog/src/windows'
-else:
-    incs += ' ../glog/src'
-
-env.BlenderLib ( libname = 'extern_ceres', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh
index 0418356c6f4..85da4f2afc9 100755
--- a/extern/libmv/third_party/ceres/bundle.sh
+++ b/extern/libmv/third_party/ceres/bundle.sh
@@ -199,69 +199,3 @@ endif()
 
 blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}")
 EOF
-
-cat > SConscript << EOF
-#!/usr/bin/env python
-
-# 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')
-
-src = []
-defs = []
-
-$src
-if env['WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS']:
-    src += env.Glob('internal/ceres/generated/*.cc')
-else:
-    src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
-    src += env.Glob('internal/ceres/generated/partitioned_matrix_view_d_d_d.cc')
-    defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
-
-defs.append('CERES_HAVE_PTHREAD')
-defs.append('CERES_NO_SUITESPARSE')
-defs.append('CERES_NO_CXSPARSE')
-defs.append('CERES_NO_LAPACK')
-defs.append('CERES_HAVE_RWLOCK')
-
-if env['WITH_BF_OPENMP']:
-    defs.append('CERES_USE_OPENMP')
-
-if env['WITH_UNORDERED_MAP_SUPPORT']:
-    if env['UNORDERED_MAP_HEADER'] == 'unordered_map':
-        if env['UNORDERED_MAP_NAMESPACE'] == 'std':
-            defs.append('CERES_STD_UNORDERED_MAP')
-        elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-            defs.append('CERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE')
-    elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-        defs.append('CERES_TR1_UNORDERED_MAP')
-else:
-    print("-- Replacing unordered_map/set with map/set (warning: slower!)")
-    defs.append('CERES_NO_UNORDERED_MAP')
-
-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')
-
-incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config'
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-        incs += ' ../msinttypes'
-
-    incs += ' ../glog/src/windows'
-else:
-    incs += ' ../glog/src'
-
-env.BlenderLib ( libname = 'extern_ceres', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-EOF
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript
deleted file mode 100644
index 178875ddec3..00000000000
--- a/extern/libopenjpeg/SConscript
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-Import('env')
-
-sources = env.Glob('*.c')
-
-incs = '.'
-flags = []
-defs = []
-
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    flags = []
-    defs.append('OPJ_STATIC')
-elif env['OURPLATFORM'] == 'darwin':
-    flags = ['-Wall', '-O3', '-ffast-math', '-std=c99'] + env['CCFLAGS'] # to supply SDK_FLAGS here
-else:
-    flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
-
-oj_env = env.Clone()
-if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    oj_env.Replace(CCFLAGS = '')
-    oj_env.Replace(BF_DEBUG_FLAGS = '')
-
-oj_env.BlenderLib ( libname='extern_openjpeg', 
-                    sources=sources, includes=Split(incs),
-                    defines=defs,
-                    libtype=['extern','player'],
-                    priority=[10,185], compileflags = flags)
diff --git a/extern/libredcode/SConscript b/extern/libredcode/SConscript
deleted file mode 100644
index 3fb78dbea0f..00000000000
--- a/extern/libredcode/SConscript
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import os
-import shutil
-
-Import('env')
-
-sources = env.Glob('*.c')
-incs = '. ../libopenjpeg'
-
-env.BlenderLib ( libname='extern_redcode', 
-                 sources=sources, includes=Split(incs),
-                 defines=[],
-                 libtype=['core','intern'],
-                 priority=[5, 5], compileflags = [])
diff --git a/extern/lzma/SConscript b/extern/lzma/SConscript
deleted file mode 100644
index d0cfed87cb6..00000000000
--- a/extern/lzma/SConscript
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('./*.c')
-
-defs = ''
-incs = ' . ' 
-
-env.BlenderLib ('extern_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
diff --git a/extern/lzo/SConscript b/extern/lzo/SConscript
deleted file mode 100644
index a87034d197a..00000000000
--- a/extern/lzo/SConscript
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('minilzo/*.c')
-
-defs = ''
-incs = ' include ' 
-
-env.BlenderLib ('extern_minilzo', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
diff --git a/extern/rangetree/SConscript b/extern/rangetree/SConscript
deleted file mode 100644
index 787decd599e..00000000000
--- a/extern/rangetree/SConscript
+++ /dev/null
@@ -1,9 +0,0 @@
-2#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('*.cc')
-
-incs = '.'
-defs = ''
-
-env.BlenderLib ('extern_rangetree', sources, Split(incs), Split(defs), libtype=['extern'], priority=[100] )
diff --git a/extern/recastnavigation/SConscript b/extern/recastnavigation/SConscript
deleted file mode 100644
index 2c15e518eb1..00000000000
--- a/extern/recastnavigation/SConscript
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/python
-
-Import('env')
-
-sources = env.Glob('Recast/Source/*.cpp') + env.Glob('Detour/Source/*.cpp')
-sources += ['recast-capi.cpp']
-
-incs = 'Recast/Include Detour/Include'
-
-env.BlenderLib ( 'extern_recastnavigation', sources, Split(incs), [],
-                 libtype=['extern','player'],
-                 priority=[10,185])
diff --git a/extern/sdlew/SConscript b/extern/sdlew/SConscript
deleted file mode 100644
index 287f9c09ec8..00000000000
--- a/extern/sdlew/SConscript
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-#
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2014, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import ('env')
-
-sources = env.Glob('src/sdlew.c')
-
-incs = 'include'
-defs = []
-
-env.BlenderLib ('extern_sdlew', sources, Split(incs), defines=defs, libtype=['extern'], priority = [999])
diff --git a/extern/wcwidth/SConscript b/extern/wcwidth/SConscript
deleted file mode 100644
index 14fdaf3f738..00000000000
--- a/extern/wcwidth/SConscript
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-
-Import('env')
-
-sources = env.Glob('*.c')
-
-incs = '.'
-
-env.BlenderLib ( 'extern_wcwidth', sources, Split(incs), [], libtype=['extern','player'], priority=[10, 185])
diff --git a/extern/xdnd/SConscript b/extern/xdnd/SConscript
deleted file mode 100644
index 6f1fe72cc28..00000000000
--- a/extern/xdnd/SConscript
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-Import('env')
-
-defs = ['HAVE_SYS_TIME_H']
-sources = env.Glob('*.c')
-
-incs = '.'
-
-env.BlenderLib ( 'extern_xdnd', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185])