Remove SCons building system

While SCons building system was serving us really good for ages it's no longer
having much attention by the developers and started to become quite a difficult
task to maintain.

What's even worse -- there started to be quite serious divergence between SCons
and CMake which was only accumulating over the releases now. The fact that none
of the active developers are really using SCons and that our main studio is also
using CMake spotting bugs in the SCons builds became quite a difficult task and
we aren't always spotting them in time.

Meanwhile CMake became really mature building system which is available on every
platform we support and arguably it's also easier and more robust to use.

This commit includes:

- Removal of actual SCons building system
- Removal of SCons git submodule
- Removal of documentation which is stored in the sources and covers SCons
- Tweaks to the buildbot master to stop using SCons submodule
  (this change requires deploying to the server)
- Tweaks to the install dependencies script to skip installing or mentioning
  SCons building system
- Tweaks to various helper scripts to avoid mention of SCons folders/files
  as well

Reviewers: mont29, dingto, dfelinto, lukastoenne, lukasstockner97, brecht, Severin, merwin, aligorith, psy-fi, campbellbarton, juicyfruit

Reviewed By: campbellbarton, juicyfruit

Differential Revision: https://developer.blender.org/D1680

32 files changed, 1 insertions, 1625 deletions

diff --git a/intern/SConscript b/intern/SConscript
deleted file mode 100644
index 736242102cc..00000000000
--- a/intern/SConscript
+++ /dev/null
@@ -1,69 +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')
-
-SConscript(['string/SConscript',
-            'ghost/SConscript',
-            'glew-mx/SConscript',
-            'guardedalloc/SConscript',
-            'moto/SConscript',
-            'memutil/SConscript/',
-            'iksolver/SConscript',
-            'itasc/SConscript',
-            'eigen/SConscript',
-            'opencolorio/SConscript',
-            'mikktspace/SConscript',
-            'smoke/SConscript',
-            'raskter/SConscript'])
-
-# currently only contains headers
-# SConscript('container/SConscript')
-
-if env['WITH_BF_AUDASPACE']:
-    SConscript(['audaspace/SConscript'])
-
-if env ['WITH_BF_REMESH']:
-    SConscript(['dualcon/SConscript'])
-
-if env['WITH_BF_FLUID']:
-    SConscript(['elbeem/SConscript'])
-
-if env['WITH_BF_CYCLES']:
-    SConscript(['cycles/SConscript'])
-
-if env['WITH_BF_INTERNATIONAL']:
-    SConscript(['locale/SConscript'])
-
-if env['WITH_BF_BULLET']:
-    SConscript (['rigidbody/SConscript'])
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
-    SConscript(['utfconv/SConscript'])
-
-if env['WITH_BF_OPENSUBDIV']:
-    SConscript (['opensubdiv/SConscript'])
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
deleted file mode 100644
index 8dfaa861ce2..00000000000
--- a/intern/audaspace/SConscript
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python
-#
-# ***** BEGIN LGPL LICENSE BLOCK *****
-#
-# Copyright 2009 Jrg Hermann Mller
-#
-# This file is part of AudaSpace.
-#
-# AudaSpace is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# AudaSpace 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
-#
-# ***** END LGPL LICENSE BLOCK *****
-
-from os import path
-Import ('env')
-
-sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp')
-
-# AUD_PyInit is for external audaspace only
-sources.remove(path.join('intern', 'AUD_PyInit.cpp'))
-
-
-incs = '. intern FX ' + env['BF_PTHREADS_INC'] + ' ' + env['BF_BOOST_INC']
-defs = []
-
-if env['WITH_BF_FFMPEG']:
-    sources += env.Glob('ffmpeg/*.cpp')
-    incs += ' ffmpeg  #/intern/ffmpeg ' + env['BF_FFMPEG_INC']
-    defs.append('WITH_FFMPEG')
-
-if env['WITH_BF_SDL']:
-    sources += env.Glob('SDL/*.cpp')
-    incs += ' SDL ' + env['BF_SDL_INC']
-    defs.append('WITH_SDL')
-
-if env['WITH_BF_OPENAL']:
-    sources += env.Glob('OpenAL/*.cpp')
-    incs += ' OpenAL ' + env['BF_OPENAL_INC']
-    defs.append('WITH_OPENAL')
-
-if env['WITH_BF_JACK']:
-    sources += env.Glob('jack/*.cpp')
-    incs += ' jack ' + env['BF_JACK_INC']
-    defs.append('WITH_JACK')
-    if env['WITH_BF_JACK_DYNLOAD']:
-        defs.append('WITH_JACK_DYNLOAD')
-
-if env['WITH_BF_SNDFILE']:
-    sources += env.Glob('sndfile/*.cpp')
-    incs += ' sndfile ' + env['BF_SNDFILE_INC']
-    defs.append('WITH_SNDFILE')
-
-#if env['WITH_BF_FFTW3']:
-#    sources += env.Glob('fftw/*.cpp')
-#    incs += ' fftw ' + env['BF_FFTW3_INC']
-#    defs.append('WITH_FFTW3')
-
-if env['WITH_BF_PYTHON']:
-    sources += env.Glob('Python/*.cpp')
-    incs += ' Python ' + env['BF_PYTHON_INC']
-    defs.append('WITH_PYTHON')
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
-
-env.BlenderLib ('bf_intern_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] )
diff --git a/intern/container/SConscript b/intern/container/SConscript
deleted file mode 100644
index 1f943157d6a..00000000000
--- a/intern/container/SConscript
+++ /dev/null
@@ -1,33 +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('intern/*.cpp')
-incs = '. #intern/guardedalloc'
-
-env.BlenderLib ('bf_intern_ctr', sources, Split(incs) , [], libtype='intern', priority = 10 )
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index c252a613cef..3df9a670f7d 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 include(cmake/external_libs.cmake)
 
 # Build Flags
-# todo: refactor this code to match scons
+# todo: this code could be refactored a bit to avoid duplication
 # note: CXX_HAS_SSE is needed in case passing SSE flags fails altogether (gcc-arm)
 
 if(WITH_CYCLES_WERROR)
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
deleted file mode 100644
index 99df8c299fc..00000000000
--- a/intern/cycles/SConscript
+++ /dev/null
@@ -1,173 +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) 2011, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Nathan Letwory.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-from os import path
-Import('env')
-
-cycles = env.Clone()
-
-cycles.Depends('../../source/blender/makesrna/intern/RNA_blender_cpp.h', 'makesrna')
-
-sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') + cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') + cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('blender/*.cpp')
-
-sources.append(path.join('kernel', 'kernels', 'cpu', 'kernel.cpp'))
-sources.remove(path.join('util', 'util_view.cpp'))
-
-incs = [] 
-defs = []
-cxxflags = Split(env['CXXFLAGS'])
-
-defs += env['BF_GL_DEFINITIONS']
-
-if env['WITH_UNORDERED_MAP_SUPPORT']:
-    if env['UNORDERED_MAP_HEADER'] == 'unordered_map':
-        if env['UNORDERED_MAP_NAMESPACE'] == 'std':
-            defs.append('CYCLES_STD_UNORDERED_MAP')
-        elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-            defs.append('CYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE')
-    elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-        defs.append('CYCLES_TR1_UNORDERED_MAP')
-else:
-    print("-- Replacing unordered_map/set with map/set (warning: slower!)")
-    defs.append('CYCLES_NO_UNORDERED_MAP')
-
-defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
-defs.append('CCL_NAMESPACE_END=}')
-
-defs.append('WITH_OPENCL')
-defs.append('WITH_MULTI')
-defs.append('WITH_CUDA')
-
-if env['WITH_BF_CYCLES_OSL']:
-    defs.append('WITH_OSL')
-    defs.append('OSL_STATIC_LIBRARY')
-    incs.append(cycles['BF_OSL_INC'])
-
-if env['WITH_BF_CYCLES_DEBUG']:
-    defs.append('WITH_CYCLES_DEBUG')
-
-if env['WITH_BF_CYCLES_LOGGING']:
-    defs.append('WITH_CYCLES_LOGGING')
-    defs.append('GOOGLE_GLOG_DLL_DECL=')
-    defs.append('CYCLES_GFLAGS_NAMESPACE=gflags')
-    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-        incs.append('#extern/libmv/third_party/glog/src/windows')
-        incs.append('#extern/libmv/third_party/gflags')
-    else:
-        incs.append('#extern/libmv/third_party/glog/src')
-        incs.append('#extern/libmv/third_party/gflags')
-
-incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
-incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna #source/blender/blenlib'.split())
-incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())
-
-incs.append(env['BF_GLEW_INC'])
-incs.append('#/intern/glew-mx')
-incs.append('#/intern/atomic')
-incs.append('#intern/mikktspace')
-incs.extend('#extern/glew/include #extern/clew/include #extern/cuew/include #intern/mikktspace'.split())
-
-incs.append(cycles['BF_OIIO_INC'])
-incs.append(cycles['BF_BOOST_INC'])
-incs.append(cycles['BF_OPENEXR_INC'].split())
-incs.extend(cycles['BF_PYTHON_INC'].split())
-
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
-else:
-    cxxflags.append('-ffast-math'.split())
-
-# Warnings
-# XXX Not supported by gcc < 4.9, since we do not have any 'supported flags' test as in cmake,
-#     simpler to comment for now.
-#if env['C_COMPILER_ID'] == 'gcc':
-#    cxxflags.append(['-Werror=float-conversion'])
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs.append(env['BF_PTHREADS_INC'])
-
-# optimized kernel. we compile the kernel multiple times with different
-# optimization flags, at runtime it will choose the optimal kernel
-kernel_flags = {}
-
-if env['OURPLATFORM'] == 'win32-vc':
-    # there is no /arch:SSE3, but intrinsics are available anyway
-    kernel_flags['sse2'] = '/arch:SSE /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /Ox /GS-'
-    kernel_flags['sse3'] = kernel_flags['sse2']
-
-elif env['OURPLATFORM'] == 'win64-vc':
-    # /arch:AVX only available from visual studio 2012
-    kernel_flags['sse2'] = '-D_CRT_SECURE_NO_WARNINGS /fp:fast /Ox /GS-'
-    kernel_flags['sse3'] = kernel_flags['sse2']
-
-    if env['MSVC_VERSION'] >= '12.0':
-        kernel_flags['sse41'] = kernel_flags['sse3']
-        kernel_flags['avx'] = kernel_flags['sse41'] + ' /arch:AVX'
-        kernel_flags['avx2'] = kernel_flags['sse41'] + ' /arch:AVX /arch:AVX2'
-else:
-    # -mavx only available with relatively new gcc/clang
-    kernel_flags['sse2'] = '-ffast-math -msse -msse2 -mfpmath=sse'
-    kernel_flags['sse3'] = kernel_flags['sse2'] + ' -msse3 -mssse3'
-    kernel_flags['sse41'] = kernel_flags['sse3'] + ' -msse4.1'
-
-    if (env['C_COMPILER_ID'] == 'gcc' and env['CCVERSION'] >= '4.6') or (env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.1'):
-        kernel_flags['avx'] = kernel_flags['sse41'] + ' -mavx'
-        kernel_flags['avx2'] = kernel_flags['avx'] + ' -mavx2 -mfma -mlzcnt -mbmi -mbmi2 -mf16c'
-
-for kernel_type in kernel_flags.keys():
-    defs.append('WITH_KERNEL_' + kernel_type.upper())
-
-for kernel_type in kernel_flags.keys():
-    kernel_source = path.join('kernel', 'kernels', 'cpu', 'kernel_' + kernel_type + '.cpp')
-    kernel_cxxflags = Split(env['CXXFLAGS'])
-    kernel_cxxflags.append(kernel_flags[kernel_type].split())
-    kernel_defs = defs[:]
-    kernel_env = cycles.Clone()
-
-    if env['OURPLATFORM'] == 'darwin' and env['C_COMPILER_ID'] == 'gcc' and  env['CCVERSION'] >= '4.6':
-        # use Apple assembler for avx , gnu-compilers do not support it ( gnu gcc-4.6 or higher case )
-        kernel_env.BlenderLib('bf_intern_cycles_' + kernel_type, [kernel_source], incs, kernel_defs,
-            libtype=['intern'], priority=[10], cxx_compileflags=kernel_cxxflags,
-            cc_compilerchange='/usr/bin/clang', cxx_compilerchange='/usr/bin/clang++')
-    else:
-        kernel_env.BlenderLib('bf_intern_cycles_' + kernel_type, [kernel_source], incs, kernel_defs,
-            libtype=['intern'], priority=[10], cxx_compileflags=kernel_cxxflags)
-
-cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'], priority=[0], cxx_compileflags=cxxflags)
-
-# OSL shaders
-if env['WITH_BF_CYCLES_OSL']:
-    oso_files = SConscript(['kernel/shaders/SConscript'])
-    cycles.Depends("kernel/osl/osl_shader.o", oso_files)
-
-    SConscript(['kernel/osl/SConscript'])
-
-# cuda kernel binaries
-if env['WITH_BF_CYCLES_CUDA_BINARIES']:
-    kernel_binaries = SConscript(['kernel/SConscript'])
-    cycles.Depends("device/device_cuda.o", kernel_binaries)
-
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript
deleted file mode 100644
index e8d51013924..00000000000
--- a/intern/cycles/kernel/SConscript
+++ /dev/null
@@ -1,121 +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) 2011, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Nathan Letwory.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-import re
-import subprocess
-import sys
-import os
-import Blender as B
-import btools
-
-def normpath(path):
-    return os.path.abspath(os.path.normpath(path))
-
-Import ('env')
-
-kernel_binaries = []
-
-#Bitness
-if B.bitness == 32:
-    bits = 32
-else:
-    bits = 64
-
-if env['WITH_BF_CYCLES_CUDA_BINARIES']:
-    kernel = env.Clone()
-
-    # cuda info
-    nvcc = env['BF_CYCLES_CUDA_NVCC']
-    cuda_archs = env['BF_CYCLES_CUDA_BINARIES_ARCH']
-
-    # build directory
-    root_build_dir = normpath(env['BF_BUILDDIR'])
-    build_dir = os.path.join(root_build_dir, 'intern/cycles/kernel')
-
-    # source directories and files
-    kernel_file_rel = os.path.join("kernels", "cuda", "kernel.cu")
-    source_dir = Dir('.').srcnode().path
-    kernel_file = os.path.join(source_dir, kernel_file_rel)
-    util_dir = os.path.join(source_dir, "../util")
-    svm_dir = os.path.join(source_dir, "../svm")
-    geom_dir = os.path.join(source_dir, "../geom")
-    closure_dir = os.path.join(source_dir, "../closure")
-
-    # get CUDA version
-    output = btools.get_command_output([nvcc, "--version"])
-    cuda_major_minor = re.findall(r'release (\d+).(\d+)', output)[0]
-    cuda_version = int(cuda_major_minor[0])*10 + int(cuda_major_minor[1])
-
-    if cuda_version != 65:
-        print("CUDA version %d.%d detected, build may succeed but only CUDA 6.5 is officially supported." % (cuda_version/10, cuda_version%10))
-
-    # nvcc flags
-    nvcc_flags = "-m%s" % (bits)
-    nvcc_flags += " --cubin --ptxas-options=\"-v\" --use_fast_math"
-    nvcc_flags += " -D__KERNEL_CUDA_VERSION__=%d" % (cuda_version)
-    nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
-    nvcc_flags += " -I \"%s\" -I \"%s\" -I \"%s\" -I \"%s\"" % (util_dir, svm_dir, geom_dir, closure_dir)
-
-    if env['WITH_BF_CYCLES_DEBUG']:
-        nvcc_flags += " -D__KERNEL_DEBUG__"
-
-    # dependencies
-    dependencies = [kernel_file_rel] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h') + kernel.Glob('geom/*.h') + kernel.Glob('closure/*.h')
-    last_cubin_file = None
-
-    configs = (("kernel_%s.cubin", ''),
-               ("kernel_experimental_%s.cubin", ' -D__KERNEL_EXPERIMENTAL__'))
-
-    # add command for each cuda architecture
-    for arch in cuda_archs:
-        for config in configs:
-            # TODO(sergey): Use dict instead ocouple in order to increase readability?
-            name = config[0]
-            extra_flags = config[1]
-
-            cubin_file = os.path.join(build_dir, name % arch)
-            current_flags = nvcc_flags + extra_flags
-
-            if env['BF_CYCLES_CUDA_ENV']:
-                MS_SDK = "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Bin\\SetEnv.cmd"
-                command = "\"%s\" & \"%s\" -arch=%s %s \"%s\" -o \"%s\"" % (MS_SDK, nvcc, arch, current_flags, kernel_file, cubin_file)
-            else:
-                command = "\"%s\" -arch=%s %s \"%s\" -o \"%s\"" % (nvcc, arch, current_flags, kernel_file, cubin_file)
-
-            kernel.Command(cubin_file, kernel_file_rel, command)
-            kernel.Depends(cubin_file, dependencies)
-
-            kernel_binaries.append(cubin_file)
-
-            if not env['WITH_BF_CYCLES_CUDA_THREADED_COMPILE']:
-                # trick to compile one kernel at a time to reduce memory usage
-                if last_cubin_file:
-                    kernel.Depends(cubin_file, last_cubin_file)
-                last_cubin_file = cubin_file
-
-Return('kernel_binaries')
-
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp b/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
index bc754f6832c..a4e43b180fb 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
@@ -33,10 +33,5 @@
 #  include "kernel.h"
 #  define KERNEL_ARCH cpu_avx
 #  include "kernel_cpu_impl.h"
-#else  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */
-
-/* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_avx(void);
-void __dummy_function_cycles_avx(void) {}
 
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX */
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp b/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
index ce4a0441f6e..fd6c753b34c 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
@@ -34,10 +34,5 @@
 #  include "kernel.h"
 #  define KERNEL_ARCH cpu_avx2
 #  include "kernel_cpu_impl.h"
-#else  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */
-
-/* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_avx2(void);
-void __dummy_function_cycles_avx2(void) {}
 
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 */
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp b/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp
index 3142f1d7e8b..7e843dc1c7c 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp
@@ -29,10 +29,5 @@
 #  include "kernel.h"
 #  define KERNEL_ARCH cpu_sse2
 #  include "kernel_cpu_impl.h"
-#else  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */
-
-/* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_sse2(void);
-void __dummy_function_cycles_sse2(void) {}
 
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 */
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp b/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp
index 93ee7d1a8ef..cc5656ed5be 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp
@@ -31,10 +31,5 @@
 #  include "kernel.h"
 #  define KERNEL_ARCH cpu_sse3
 #  include "kernel_cpu_impl.h"
-#else  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */
-
-/* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_sse3(void);
-void __dummy_function_cycles_sse3(void) {}
 
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 */
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp b/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp
index c3ace9e8c07..252e16873aa 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp
@@ -32,10 +32,5 @@
 #  include "kernel.h"
 #  define KERNEL_ARCH cpu_sse41
 #  include "kernel_cpu_impl.h"
-#else  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */
-
-/* needed for some linkers in combination with scons making empty compilation unit in a library */
-void __dummy_function_cycles_sse41(void);
-void __dummy_function_cycles_sse41(void) {}
 
 #endif  /* WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 */
diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript
deleted file mode 100644
index 74ba5e1020c..00000000000
--- a/intern/cycles/kernel/osl/SConscript
+++ /dev/null
@@ -1,80 +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) 2011, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Nathan Letwory.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import('env')
-
-defs = []
-incs = []
-cxxflags = Split(env['CXXFLAGS'])
-
-sources = env.Glob('*.cpp')
-
-incs.extend('. .. ../svm ../../render ../../util ../../device'.split())
-incs.append(env['BF_OIIO_INC'])
-incs.append(env['BF_BOOST_INC'])
-incs.append(env['BF_OSL_INC'])
-incs.append(env['BF_OPENEXR_INC'].split())
-incs.append('#/intern/atomic')
-
-defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
-defs.append('CCL_NAMESPACE_END=}')
-defs.append('WITH_OSL')
-
-if env['WITH_UNORDERED_MAP_SUPPORT']:
-    if env['UNORDERED_MAP_HEADER'] == 'unordered_map':
-        if env['UNORDERED_MAP_NAMESPACE'] == 'std':
-            defs.append('CYCLES_STD_UNORDERED_MAP')
-        elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-            defs.append('CYCLES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE')
-    elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
-        defs.append('CYCLES_TR1_UNORDERED_MAP')
-else:
-    print("-- Replacing unordered_map/set with map/set (warning: slower!)")
-    defs.append('CYCLES_NO_UNORDERED_MAP')
-
-if env['WITH_BF_CYCLES_DEBUG']:
-    defs.append('WITH_CYCLES_DEBUG')
-
-if env['WITH_BF_CYCLES_LOGGING']:
-    defs.append('WITH_CYCLES_LOGGING')
-    defs.append('GOOGLE_GLOG_DLL_DECL=')
-    defs.append('CYCLES_GFLAGS_NAMESPACE=gflags')
-    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-        incs.append('#extern/libmv/third_party/glog/src/windows')
-        incs.append('#extern/libmv/third_party/gflags')
-    else:
-        incs.append('#extern/libmv/third_party/glog/src')
-        incs.append('#extern/libmv/third_party/gflags')
-
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID /fp:fast'.split())
-    incs.append(env['BF_PTHREADS_INC'])
-    defs.append('OSL_STATIC_LIBRARY')
-else:
-    cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID -ffast-math'.split())
-
-env.BlenderLib ('cycles_kernel_osl', sources, incs, defs, libtype=['intern'], priority=[10], cxx_compileflags=cxxflags)
diff --git a/intern/cycles/kernel/shaders/SConscript b/intern/cycles/kernel/shaders/SConscript
deleted file mode 100644
index 8bc1c2206e0..00000000000
--- a/intern/cycles/kernel/shaders/SConscript
+++ /dev/null
@@ -1,68 +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) 2011, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Nathan Letwory.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-import sys
-import os
-import Blender as B
-
-def normpath(path):
-    return os.path.abspath(os.path.normpath(path))
-
-Import ('env')
-
-oso_files = []
-
-if env['WITH_BF_CYCLES_OSL']:
-    shaders = env.Clone()
-
-    # osl compiler
-    osl_compiler = File(env.subst(env['BF_OSL_COMPILER'])).abspath
-
-    # build directory
-    root_build_dir = normpath(env['BF_BUILDDIR'])
-    build_dir = os.path.join(root_build_dir, 'intern/cycles/kernel/shaders')
-
-    # source directories and files
-    source_dir = Dir('.').srcnode().path
-
-    # dependencies
-    dependencies = shaders.Glob('*.h')
-
-    for f in os.listdir(source_dir):
-        if f.endswith('.osl'):
-            osl_file = os.path.join(source_dir, f)
-            oso_file = os.path.join(build_dir, f.replace('.osl', '.oso'))
-
-            command = "\"%s\" -q -O2 -I\"%s\" -o \"%s\" \"%s\"" % (osl_compiler, source_dir, oso_file, osl_file)
-
-            shaders.Command(oso_file, f, command)
-            shaders.Depends(oso_file, [f] + dependencies)
-
-            oso_files.append(oso_file)
-
-
-Return('oso_files')
diff --git a/intern/dualcon/SConscript b/intern/dualcon/SConscript
deleted file mode 100644
index 34df21a74c3..00000000000
--- a/intern/dualcon/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('intern/*.cpp')
-
-incs = '. ../../extern/Eigen3'
-defs = ''
-
-env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
diff --git a/intern/eigen/SConscript b/intern/eigen/SConscript
deleted file mode 100644
index 0c98ec1837d..00000000000
--- a/intern/eigen/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) 2015, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Bastien Montagne.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import('env')
-
-sources = env.Glob('intern/*.cc')
-
-incs = '. #/extern/Eigen3'
-defs = []
-
-env.BlenderLib('bf_intern_eigen', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185])
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript
deleted file mode 100644
index e3a20cf9d45..00000000000
--- a/intern/elbeem/SConscript
+++ /dev/null
@@ -1,48 +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 sys
-import os
-Import('env')
-
-sources = env.Glob('intern/*.cpp')
-
-incs = ''
-defs = 'NOGUI ELBEEM_BLENDER=1'
-
-if env['WITH_BF_OPENMP']:
-    if env['OURPLATFORM'] == 'linuxcross':
-            incs += ' ' + env['BF_OPENMP_INC']
-
-    defs += ' PARALLEL'
-
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    defs += ' USE_MSVC6FIXES'
-incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] 
-incs += ' extern ../../guardedalloc'
-
-env.BlenderLib ('bf_intern_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 )
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
deleted file mode 100644
index 8fbe65fbf27..00000000000
--- a/intern/ghost/SConscript
+++ /dev/null
@@ -1,203 +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 sys
-import os
-
-Import ('env')
-
-window_system = env['OURPLATFORM']
-
-sources = env.Glob('intern/*.cpp')
-if window_system == 'darwin':
-    sources += env.Glob('intern/*.mm')
-    #remove, will be readded below if needed.
-    sources.remove('intern' + os.sep + 'GHOST_ContextCGL.mm')
-
-if not env['WITH_BF_GL_EGL']:
-    sources.remove('intern' + os.sep + 'GHOST_ContextEGL.cpp')
-
-# seems cleaner to remove these now then add back the one that is needed
-sources.remove('intern' + os.sep + 'GHOST_ContextGLX.cpp')
-sources.remove('intern' + os.sep + 'GHOST_ContextWGL.cpp')
-
-pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager', 'GHOST_Context']
-
-defs = []
-defs += env['BF_GL_DEFINITIONS']
-
-if env['WITH_BF_GL_EGL']:
-    defs.append('WITH_EGL')
-
-incs = [
-    '.',
-    env['BF_GLEW_INC'],
-    '../glew-mx',
-    '#source/blender/imbuf',
-    '#source/blender/makesdna',
-    '../string',
-    ]
-incs = ' '.join(incs)
-
-if env['WITH_GHOST_SDL']:
-    for f in pf:
-        try:
-            sources.remove('intern' + os.sep + f + 'Win32.cpp')
-            sources.remove('intern' + os.sep + f + 'X11.cpp')
-        except ValueError:
-            pass
-    incs += ' ' + env['BF_SDL_INC']
-    defs += ['WITH_GHOST_SDL']
-elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'):
-    for f in pf:
-        try:
-            sources.remove('intern' + os.sep + f + 'Win32.cpp')
-        except ValueError:
-            pass
-
-        try:
-            sources.remove('intern' + os.sep + f + 'SDL.cpp')
-        except ValueError:
-            pass
-
-    defs += ['WITH_X11']
-
-    ## removing because scons does not support system installation
-    ## if this is used for blender.org builds it means our distrobution
-    ## will find any locally installed blender and double up its script path.
-    ## So until this is supported properly as with CMake,
-    ## just dont use the PREFIX.
-    # defs += ['PREFIX=\\"/usr/local/\\"']  # XXX, make an option
-    if env['WITH_X11_XINPUT']:
-        defs += ['WITH_X11_XINPUT']
-
-    if env['WITH_X11_XF86VMODE']:
-        #incs += env['X11_xf86vmode_INCLUDE_PATH']
-        defs += ['WITH_X11_XF86VMODE']
-
-    # freebsd doesn't seem to support XDND protocol
-    if env['WITH_GHOST_XDND'] and window_system not in ('freebsd7', 'freebsd8', 'freebsd9'):
-        incs += ' #/extern/xdnd'
-        defs += ['WITH_XDND']
-    else:
-        sources.remove('intern' + os.sep + 'GHOST_DropTargetX11.cpp')
-
-    if not env['WITH_BF_GL_EGL']:
-        sources.append('intern' + os.sep + 'GHOST_ContextGLX.cpp')
-
-elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    for f in pf:
-        try:
-            sources.remove('intern' + os.sep + f + 'X11.cpp')
-        except ValueError:
-            pass
-
-        try:
-            sources.remove('intern' + os.sep + f + 'Unix.cpp')
-        except ValueError:
-            pass
-
-        try:
-            sources.remove('intern' + os.sep + f + 'SDL.cpp')
-        except ValueError:
-            pass
-
-    if not env['WITH_BF_GL_EGL']:
-        sources.append('intern' + os.sep + 'GHOST_ContextWGL.cpp')
-
-elif window_system == 'darwin':
-    if env['WITH_BF_QUICKTIME']:
-        defs.append('WITH_QUICKTIME')
-    for f in pf:
-        try:
-            sources.remove('intern' + os.sep + f + 'Win32.cpp')
-        except ValueError:
-            pass
-
-        try:
-            sources.remove('intern' + os.sep + f + 'X11.cpp')
-        except ValueError:
-            pass
-        try:
-            sources.remove('intern' + os.sep + f + 'Unix.cpp')
-        except ValueError:
-            pass
-        try:
-            sources.remove('intern' + os.sep + f + 'SDL.cpp')
-        except ValueError:
-            pass
-
-    if not env['WITH_BF_GL_EGL']:
-        sources.append('intern' + os.sep + 'GHOST_ContextCGL.mm')
-
-else:
-    print "Unknown window system specified."
-    Exit()
-
-if env['BF_GHOST_DEBUG']:
-    defs.append('WITH_GHOST_DEBUG')
-else:
-    sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp')
-
-if env['WITH_BF_IME'] and window_system in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
-    defs.append('WITH_INPUT_IME')
-elif env['WITH_BF_IME']:
-    print "IME input is only supported on Windows! Please disable WITH_BF_IME!"
-    Exit()
-else:
-    sources.remove('intern' + os.sep + 'GHOST_ImeWin32.cpp')
-
-if env['WITH_BF_3DMOUSE']:
-    defs.append('WITH_INPUT_NDOF')
-
-    if env['OURPLATFORM'] in ('linux','darwin'):
-        incs += ' ' + env['BF_3DMOUSE_INC']
-else:
-    sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp')
-    try:
-        if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'):
-            sources.remove('intern' + os.sep + 'GHOST_NDOFManagerWin32.cpp')
-        elif window_system=='darwin':
-            sources.remove('intern' + os.sep + 'GHOST_NDOFManagerCocoa.mm')
-        else:
-            sources.remove('intern' + os.sep + 'GHOST_NDOFManagerUnix.cpp')
-    except ValueError:
-        pass
-
-if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs = env['BF_WINTAB_INC'] + ' ' + incs
-    incs += ' ../utfconv'
-
-if window_system in ('win32-vc', 'win64-vc'):
-    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') )
-
-elif window_system == 'darwin' and env['C_COMPILER_ID'] == 'gcc' and  env['CCVERSION'] >= '4.6': # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
-    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
-    print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
-
-else:
-    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )
diff --git a/intern/glew-mx/SConscript b/intern/glew-mx/SConscript
deleted file mode 100644
index 546470d020c..00000000000
--- a/intern/glew-mx/SConscript
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-import sys
-import os
-
-Import('env')
-
-sources = ['intern/glew-mx.c']
-defs = []
-defs += env['BF_GL_DEFINITIONS']
-incs = [
-    '.',
-    env['BF_GLEW_INC'],
-    ]
-
-env.BlenderLib('intern_glew_mx', sources, incs, defs, libtype=['intern','player'], priority=[50, 185])
diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript
deleted file mode 100644
index 3bae808cc94..00000000000
--- a/intern/guardedalloc/SConscript
+++ /dev/null
@@ -1,45 +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')
-
-defs = []
-
-sources = [
-    'intern/mallocn.c', 
-    'intern/mallocn_guarded_impl.c',
-	'intern/mallocn_lockfree_impl.c',
-    'intern/mmap_win.c'
-]
-
-if env['WITH_BF_CXX_GUARDEDALLOC']:
-    sources.append('cpp/mallocn.cpp')
-    defs.append('WITH_CXX_GUARDEDALLOC')
-
-incs = '. ../atomic'
-
-env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] )
diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript
deleted file mode 100644
index 12d9d14712b..00000000000
--- a/intern/iksolver/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('intern/*.cpp')
-
-incs = 'intern #/extern/Eigen3'
-
-env.BlenderLib ('bf_intern_iksolver', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )
-
diff --git a/intern/itasc/SConscript b/intern/itasc/SConscript
deleted file mode 100644
index bd20368f001..00000000000
--- a/intern/itasc/SConscript
+++ /dev/null
@@ -1,38 +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('*.cpp')
-sources += env.Glob('kdl/*.cpp')
-sources += env.Glob('kdl/utilities/*.cpp')
-
-incs = '. ../../extern/Eigen3'
-
-defs = []
-
-env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100])
diff --git a/intern/locale/SConscript b/intern/locale/SConscript
deleted file mode 100644
index 02b4d6cda1b..00000000000
--- a/intern/locale/SConscript
+++ /dev/null
@@ -1,92 +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) 2012, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Bastien Montagne.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import('env')
-
-sources = env.Glob('*.cpp')
-
-if env['OURPLATFORM'] in ['darwin']:
-    # Cocoa code to read user locale on OSX
-    sources.append('osx_user_locale.mm')
-
-incs = '.'
-defs = []
-
-if env['WITH_BF_INTERNATIONAL']:
-    defs.append('WITH_INTERNATIONAL')
-    incs += ' ' + env['BF_BOOST_INC']
-
-env.BlenderLib( 'bf_intern_locale', sources, Split(incs), defs, libtype=['intern','player'], priority=[10, 185])
-
-if env['WITH_BF_INTERNATIONAL']:
-    import os
-    from os.path import dirname
-
-    def normpath(path):
-        return os.path.abspath(os.path.normpath(path))
-
-    # build directory
-    source_dir = Dir('.').srcnode().path
-    root_build_dir = normpath(env['BF_BUILDDIR'])
-    root_source_dir = dirname(dirname(normpath(source_dir)))
-    po_dir = os.path.join(root_source_dir, "release", "datafiles", "locale", "po")
-    build_dir = os.path.join(root_build_dir, 'locale')
-
-    if os.path.exists(po_dir):
-        # create directory if needed
-        if not os.path.exists(build_dir):
-            os.makedirs(build_dir)
-
-        msgfmt_tool = env.Clone()
-        msgfmt_tool.Append(LINKFLAGS = env['PLATFORM_LINKFLAGS'])
-
-        targetpath = root_build_dir + '/msgfmt'
-
-        msgfmt_target = msgfmt_tool.Program(target = targetpath, source = ['msgfmt.cc'])
-
-        locale = env.Clone()
-
-        # dependencies
-        dependencies = [msgfmt_target]
-
-        # add command for each locale
-        all_mo_files = []
-        for f in os.listdir(po_dir):
-            if not f.endswith(".po"):
-                continue
-
-            po_file = os.path.join(po_dir, f)
-            mo_file = os.path.join(build_dir, os.path.splitext(f)[0] + ".mo")
-
-            command = "\"%s\" \"%s\" \"%s\"" % (targetpath, po_file, mo_file)
-
-            locale.Command(mo_file, po_file, command)
-            locale.Depends(mo_file, dependencies)
-
-            all_mo_files.append(mo_file)
-
-        env.Depends("boost_locale_wrapper.cpp", all_mo_files)
diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript
deleted file mode 100644
index 95fa39eb9c5..00000000000
--- a/intern/memutil/SConscript
+++ /dev/null
@@ -1,34 +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('intern/*.cpp')
-
-incs = '. ..'
-
-env.BlenderLib ('bf_intern_memutil', sources, Split(incs), [], libtype=['intern','player'], priority = [0,155] )
diff --git a/intern/mikktspace/SConscript b/intern/mikktspace/SConscript
deleted file mode 100644
index fcb257a4ea0..00000000000
--- a/intern/mikktspace/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): Daniel Genrich
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import ('env')
-
-sources = ['mikktspace.c']
-
-incs = ''
-defs = ''
-
-env.BlenderLib ('bf_intern_mikktspace', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
diff --git a/intern/moto/SConscript b/intern/moto/SConscript
deleted file mode 100644
index 34a0afe27f8..00000000000
--- a/intern/moto/SConscript
+++ /dev/null
@@ -1,34 +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('intern/*.cpp')
-
-incs = 'include'
-
-env.BlenderLib ('bf_intern_moto', sources, Split(incs), [], libtype=['intern','player'], priority = [130,95] )
diff --git a/intern/opencolorio/SConscript b/intern/opencolorio/SConscript
deleted file mode 100644
index 6be6a5ed90c..00000000000
--- a/intern/opencolorio/SConscript
+++ /dev/null
@@ -1,56 +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) 2012, 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('*.cc')
-
-incs = '. ../guardedalloc ../../source/blender/blenlib'
-defs = []
-
-defs += env['BF_GL_DEFINITIONS']
-
-if env['WITH_BF_OCIO']:
-    defs.append('WITH_OCIO')
-    incs += ' ' + env['BF_OCIO_INC']
-    incs += ' ' + env['BF_GLEW_INC']
-    incs += ' ' + '#/intern/glew-mx'
-
-    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-        incs += ' ' + env['BF_BOOST_INC']
-
-    # generated data files
-    import os
-    sources.extend((
-        os.path.join(env['DATA_SOURCES'], "gpu_shader_display_transform.glsl.c"),
-    ))
-
-else:
-    sources.remove('ocio_impl.cc')
-    sources.remove('ocio_impl_glsl.cc')
-
-env.BlenderLib( 'bf_intern_opencolorio', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185])
diff --git a/intern/opensubdiv/SConscript b/intern/opensubdiv/SConscript
deleted file mode 100644
index 0532bae1c29..00000000000
--- a/intern/opensubdiv/SConscript
+++ /dev/null
@@ -1,69 +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) 2013, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-import os
-
-Import('env')
-
-sources = env.Glob('*.cc')
-
-defs = [ 'GLEW_STATIC' ]
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    defs += [ 'NOMINMAX' ]
-
-incs = '. ../guardedalloc #extern/clew/include/'
-incs += ' ' + env['BF_OPENSUBDIV_INC']
-incs += ' #/extern/glew/include'
-
-def checkOpenSubdivHeaderDefine(header, define):
-    include_path = Dir(env.subst(env['BF_OPENSUBDIV_INC'])).abspath
-    header_path = os.path.join(include_path, 'opensubdiv', 'osd', header)
-    if os.path.exists(header_path):
-        defs.append(define)
-        return True
-    return False
-
-checkOpenSubdivHeaderDefine("tbbEvaluator.h", 'OPENSUBDIV_HAS_TBB')
-#if checkOpenSubdivHeaderDefine("clEvaluator.h", 'OPENSUBDIV_HAS_OPENCL'):
-#    defs += ['OPENSUBDIV_HAS_CLEW']
-#    incs += ' #/extern/clew/include'
-#if checkOpenSubdivHeaderDefine("cudaEvaluator.h", 'OPENSUBDIV_HAS_CUDA'):
-#    defs += ['OPENSUBDIV_HAS_CUEW']
-#    incs += ' #/extern/cuew/include'
-checkOpenSubdivHeaderDefine("glXFBEvaluator.h", 'OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK')
-checkOpenSubdivHeaderDefine("glComputeEvaluator.h", 'OPENSUBDIV_HAS_GLSL_COMPUTE')
-
-if env['WITH_BF_LIBMV']:
-    defs += ['OPENSUBDIV_HAS_OPENMP']
-
-# generated data files
-sources.extend((
-    os.path.join(env['DATA_SOURCES'], "gpu_shader_opensubd_display.glsl.c"),
-))
-
-env.BlenderLib('bf_intern_opensubdiv', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185])
diff --git a/intern/raskter/SConscript b/intern/raskter/SConscript
deleted file mode 100644
index c7bf647b0e2..00000000000
--- a/intern/raskter/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) 2012, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Peter Larabell
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import ('env')
-
-sources = ['raskter.c']
-
-incs = ''
-defs = ''
-
-env.BlenderLib ('bf_intern_raskter', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
diff --git a/intern/rigidbody/SConscript b/intern/rigidbody/SConscript
deleted file mode 100644
index 977281f8eef..00000000000
--- a/intern/rigidbody/SConscript
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-# $Id: SConscript $
-# ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2010, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Joshua Leung
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import('env')
-
-# XXX: we need a contingency plan for when not compiling with Bullet,
-# since this module will always get included... 
-# This problem will also apply to other engines at a later date too...
-sources = env.Glob('*.cpp')
-
-incs = [
-    '.',
-    '../../extern/bullet2/src',
-    ]
-
-env.BlenderLib('bf_intern_rigidbody', sources=sources,
-               includes=incs, defines=[],
-               libtype=['core', 'player'], priority=[180, 30])
diff --git a/intern/smoke/SConscript b/intern/smoke/SConscript
deleted file mode 100644
index c4a579b22b3..00000000000
--- a/intern/smoke/SConscript
+++ /dev/null
@@ -1,48 +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): Daniel Genrich
-#
-# ***** END GPL LICENSE BLOCK *****
-
-Import ('env')
-
-sources = env.Glob('intern/*.cpp')
-
-incs = ''
-defs = ''
-
-if env['WITH_BF_OPENMP']:
-    if env['OURPLATFORM'] == 'linuxcross':
-        incs += ' ' + env['BF_OPENMP_INC']
-
-    defs += ' PARALLEL=1'
-
-incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] 
-incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
-
-if env['WITH_BF_FFTW3']:
-    defs += ' WITH_FFTW3'
-    incs += env['BF_FFTW3_INC'] 
-
-env.BlenderLib ('bf_intern_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
diff --git a/intern/string/SConscript b/intern/string/SConscript
deleted file mode 100644
index 8e14605b15d..00000000000
--- a/intern/string/SConscript
+++ /dev/null
@@ -1,39 +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('intern/*.cpp')
-incs = '.'
-
-defs = []
-
-if env['WITH_BF_CXX_GUARDEDALLOC']:
-    defs.append('WITH_CXX_GUARDEDALLOC')
-    incs += ' #intern/guardedalloc'
-
-env.BlenderLib ('bf_intern_string', sources, Split(incs), defs, libtype=['intern','player'], priority = [50,10] )
diff --git a/intern/utfconv/SConscript b/intern/utfconv/SConscript
deleted file mode 100644
index 875f6154d55..00000000000
--- a/intern/utfconv/SConscript
+++ /dev/null
@@ -1,41 +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 = ['utfconv.c']
-
-incs = '.'
-defs = ''
-
-# This is odd but leave it for now...
-# Why have win32 check here? - this is only used for windows.
-# ... because one day we might want to use it on other platforms.
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
-	sources += ['utf_winfunc.c']
-
-env.BlenderLib('bf_utfconv', sources, Split(incs), Split(defs), libtype=['intern','player'], priority=[0,0])