Build fix for 2.4x branch (CMake on recent Linux)

fix for memory leak converting an idproperty group into a dict
fixes for DXF-importer script:
2014-10-20 09:56:43 +02:00 · 2011-06-17 05:54:39 +00:00 · 2011-05-10 00:18:36 +00:00 · 2011-04-28 02:05:41 +00:00 · 2011-03-09 03:29:12 +00:00 · 2011-02-25 02:38:19 +00:00
7430 changed files with 1018337 additions and 1866550 deletions
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -0,0 +1,106 @@
+MACRO(BLENDERLIB_NOLIST
+  name
+  sources
+  includes)
+
+  # Gather all headers
+  FILE(GLOB_RECURSE INC_ALL *.h)
+     
+  INCLUDE_DIRECTORIES(${includes})
+  ADD_LIBRARY(${name} ${INC_ALL} ${sources})
+
+  # Group by location on disk
+  SOURCE_GROUP(Files FILES CMakeLists.txt)
+  SET(ALL_FILES ${sources} ${INC_ALL})
+  FOREACH(SRC ${ALL_FILES})
+    STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
+    STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
+    STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
+    IF(REL_DIR)
+      SOURCE_GROUP(${REL_DIR} FILES ${SRC})
+    ELSE(REL_DIR)
+      SOURCE_GROUP(Files FILES ${SRC})
+    ENDIF(REL_DIR)
+  ENDFOREACH(SRC)
+
+  MESSAGE(STATUS "Configuring library ${name}")
+ENDMACRO(BLENDERLIB_NOLIST)
+
+MACRO(BLENDERLIB
+  name
+  sources
+  includes)
+
+  BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
+
+  # Add to blender's list of libraries
+  FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
+ENDMACRO(BLENDERLIB)
+
+MACRO(SETUP_LIBDIRS)
+  # see "cmake --help-policy CMP0003"
+  if(COMMAND cmake_policy)
+    CMAKE_POLICY(SET CMP0003 NEW)
+  endif(COMMAND cmake_policy)
+  LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
+  IF(WITH_INTERNATIONAL)
+    LINK_DIRECTORIES(${GETTEXT_LIBPATH})
+    LINK_DIRECTORIES(${FREETYPE_LIBPATH})
+  ENDIF(WITH_INTERNATIONAL)
+  IF(WITH_OPENAL)
+    LINK_DIRECTORIES(${OPENAL_LIBPATH})
+  ENDIF(WITH_OPENAL)
+
+  IF(WIN32)
+    LINK_DIRECTORIES(${PTHREADS_LIBPATH})
+  ENDIF(WIN32)
+ENDMACRO(SETUP_LIBDIRS)
+
+MACRO(SETUP_LIBLINKS
+  target)
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
+  #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+
+  TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+
+  # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
+
+  IF(WIN32)
+
+            TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+
+            TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+
+  ELSE(WIN32)
+
+            TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+
+  ENDIF(WIN32)
+
+  IF(WITH_INTERNATIONAL)
+    TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
+  ENDIF(WITH_INTERNATIONAL)
+  IF(WITH_OPENAL)
+    TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIB})
+  ENDIF(WITH_OPENAL)
+  IF(WIN32)
+    TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
+  ENDIF(WIN32)
+  IF(WITH_QUICKTIME)
+    TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
+  ENDIF(WITH_QUICKTIME)
+  IF(WITH_OPENEXR)
+    TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+  ENDIF(WITH_OPENEXR)
+  IF(WITH_FFMPEG)
+    TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
+  ENDIF(WITH_FFMPEG)
+  IF(WIN32)
+    TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
+  ENDIF(WIN32)
+  IF(UNIX AND NOT APPLE)
+    TARGET_LINK_LIBRARIES(${target} ${CMAKE_DL_LIBS})
+    TARGET_LINK_LIBRARIES(${target} ${X11_X11_LIB})
+  ENDIF(UNIX AND NOT APPLE)
+ENDMACRO(SETUP_LIBLINKS)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/14
+++ b/14
@@ -1,11 +1,3 @@
-Blender uses the GNU General Public License, which describes the rights
-to distribute or change the code. 
-
-Please read this file for the full license.
-doc/license/GPL-license.txt
-
-Apart from the GNU GPL, Blender is not available under other licenses.
-
-2010, Blender Foundation
-foundation@blender.org
-
+Please read over both of the following files:
+doc/GPL-license.txt
+doc/BL-license.txt
--- a/295
+++ b/295
@@ -1,295 +0,0 @@
-# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=4
-#
-# ##### 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU`
-# eg:
-#   ../build_linux_i386
-# This is for users who like to configure & build blender with a single command.
-
-
-# System Vars
-OS:=$(shell uname -s)
-OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
-# CPU:=$(shell uname -m)  # UNUSED
-
-
-# Source and Build DIR's
-BLENDER_DIR:=$(shell pwd -P)
-BUILD_TYPE:=Release
-
-ifndef BUILD_CMAKE_ARGS
-	BUILD_CMAKE_ARGS:=
-endif
-
-ifndef BUILD_DIR
-	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
-endif
-
-
-# -----------------------------------------------------------------------------
-# additional targets for the build configuration
-
-# support 'make debug'
-ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_debug
-	BUILD_TYPE:=Debug
-endif
-ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_lite
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake
-endif
-ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_bpy
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
-endif
-ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_bpy
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake
-endif
-
-
-# -----------------------------------------------------------------------------
-# Get the number of cores for threaded build
-NPROCS:=1
-ifeq ($(OS), Linux)
-	NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
-endif
-ifeq ($(OS), Darwin)
-	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)
-endif
-ifeq ($(OS), FreeBSD)
-	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
-endif
-ifeq ($(OS), NetBSD)
-	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
-endif
-
-
-# -----------------------------------------------------------------------------
-# Macro for configuring cmake
-
-CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
-                     -H$(BLENDER_DIR) \
-                     -B$(BUILD_DIR) \
-                     -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
-
-
-# -----------------------------------------------------------------------------
-# Tool for 'make config'
-
-# X11 spesific
-ifdef DISPLAY
-	CMAKE_CONFIG_TOOL = cmake-gui
-else 
-	CMAKE_CONFIG_TOOL = ccmake
-endif
-
-
-# -----------------------------------------------------------------------------
-# Build Blender
-all:
-	@echo
-	@echo Configuring Blender ...
-
-	# if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-	# 	$(CMAKE_CONFIG); \
-	# fi
-	
-	# do this always incase of failed initial build, could be smarter here...
-	$(CMAKE_CONFIG)
-
-	@echo
-	@echo Building Blender ...
-	$(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
-	@echo
-	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
-	@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
-	@echo
-
-debug: all
-lite: all
-headless: all
-bpy: all
-
-
-# -----------------------------------------------------------------------------
-# Configuration (save some cd'ing around)
-config:
-	$(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
-
-
-# -----------------------------------------------------------------------------
-# Help for build targets
-help:
-	@echo ""
-	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
-	@echo "  * debug     - build a debug binary"
-	@echo "  * lite      - disable non essential features for a smaller binary and faster build"
-	@echo "  * headless  - build without an interface (renderfarm or server automation)"
-	@echo "  * bpy       - build as a python module which can be loaded from python directly"
-	@echo ""
-	@echo "  * config    - run cmake configuration tool to set build options"
-	@echo ""
-	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
-	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
-	@echo ""
-	@echo ""
-	@echo "Project Files for IDE's"
-	@echo "  * project_qtcreator - QtCreator Project Files"
-	@echo "  * project_netbeans  - NetBeans Project Files"
-	@echo "  * project_eclipse   - Eclipse CDT4 Project Files"
-	@echo ""
-	@echo "Package Targets"
-	@echo "  * package_debian  - build a debian package"
-	@echo "  * package_pacman  - build an arch linux pacmanpackage"
-	@echo "  * package_archive - build an archive package"
-	@echo ""
-	@echo "Testing Targets (not associated with building blender)"
-	@echo "  * test            - run ctest, currently tests import/export, operator execution and that python modules load"
-	@echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
-	@echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
-	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
-	@echo "  * test_style      - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
-	@echo ""
-	@echo "Static Source Code Checking (not associated with building blender)"
-	@echo "  * check_cppcheck    - run blender source through cppcheck (C & C++)"
-	@echo "  * check_clang_array - run blender source through clang array checking script (C & C++)"
-	@echo "  * check_splint      - run blenders source through splint (C only)"
-	@echo "  * check_sparse      - run blenders source through sparse (C only)"
-	@echo "  * check_smatch      - run blenders source through smatch (C only)"
-	@echo "  * check_spelling_c  - check for spelling errors (C/C++ only)"
-	@echo "  * check_spelling_py - check for spelling errors (Python only)"
-	@echo ""
-	@echo "Documentation Targets (not associated with building blender)"
-	@echo "  * doc_py   - generate sphinx python api docs"
-	@echo "  * doc_doxy - generate doxygen C/C++ docs"
-	@echo "  * doc_dna  - generate blender file format reference"
-	@echo "  * doc_man  - generate manpage"
-	@echo ""
-
-# -----------------------------------------------------------------------------
-# Packages
-#
-package_debian:
-	cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
-
-package_pacman:
-	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
-
-package_archive:
-	make -C $(BUILD_DIR) -s package_archive
-	@echo archive in "$(BUILD_DIR)/release"
-
-
-# -----------------------------------------------------------------------------
-# Tests
-#
-test:
-	cd $(BUILD_DIR) ; ctest . --output-on-failure
-
-# run pep8 check check on scripts we distribute.
-test_pep8:
-	python3.2 source/tests/pep8.py > test_pep8.log 2>&1
-	@echo "written: test_pep8.log"
-
-# run some checks on our cmakefiles.
-test_cmake:
-	python3.2 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
-	@echo "written: test_cmake_consistency.log"
-
-# run deprecation tests, see if we have anything to remove.
-test_deprecated:
-	python3.2 source/tests/check_deprecated.py
-
-test_style:
-	# run our own checks on C/C++ style
-	PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
-
-# -----------------------------------------------------------------------------
-# Project Files
-#
-
-project_qtcreator:
-	python3.2 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
-
-project_netbeans:
-	python3.2 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
-
-project_eclipse:
-	cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
-
-
-# -----------------------------------------------------------------------------
-# Static Checking
-#
-
-check_cppcheck:
-	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
-
-check_clang_array:
-	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py
-
-check_splint:
-	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
-
-check_sparse:
-	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
-
-check_smatch:
-	$(CMAKE_CONFIG)
-	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py
-
-check_spelling_py:
-	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
-
-check_spelling_c:
-	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
-
-# -----------------------------------------------------------------------------
-# Documentation
-#
-
-# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
-doc_py:
-	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
-	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
-	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
-
-doc_doxy:
-	cd doc/doxygen; doxygen Doxyfile
-	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
-
-doc_dna:
-	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
-	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
-
-doc_man:
-	python3.2 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
-
-
-clean:
-	$(MAKE) -C $(BUILD_DIR) clean
-
-.PHONY: all
--- a/60
+++ b/60
@@ -0,0 +1,60 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
+# $Id$
+#
+# ***** 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) 2002 by Wouter van Heyst
+# All rights reserved.
+#
+# The Original Code is: revision 1.1
+#
+# Contributor(s): Hans Lambermont
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+# Toplevel Makefile for blender. Bounces make to subdirectories.
+# Available targets: 'all' 'debug' 'release'
+
+# If the user wants to override some of the build
+# vars they can put it in the file user-def.mk which
+# will get included if it exists (please do not commit
+# user-def.mk to the revision control server).
+sinclude user-def.mk
+
+# To build without openAL, set it as an environment variable,
+# or put it uncommented in user-def.mk:
+# export NAN_NO_OPENAL=true
+
+export NANBLENDERHOME=$(shell pwd)
+MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+
+SOURCEDIR = 
+ifeq ($(FREE_WINDOWS),true)
+    DIRS ?= dlltool extern intern source po
+else
+    DIRS ?= extern intern source po
+endif
+
+include source/nan_subdirs.mk
+
+.PHONY: release
+release:
+	@echo "====> $(MAKE) $@ in $(SOURCEDIR)/$@" ;\
+	    $(MAKE) -C $@ $@ || exit 1;
+
+
--- a/45
+++ b/45
@@ -0,0 +1,45 @@
+Welcome to the fun world of open source.
+
+For instructions on building and installing Blender, please see the file named
+INSTALL.
+
+
+---------------------.Blanguages and the .blender directory---------------------
+
+The .blender directory holds various data files for Blender.
+In the 2.28a release those are the .Blanguages file containing a list of
+translations, the translations themselves and a default ttf font.
+
+Blender checks for the presence of this directory in several locations:
+	- the current directory
+	- your home directory
+	- On OSX, the blender bundle is also checked 
+	- On Windows, the installation dir is checked.
+
+If you get a 'File ".Blanguages" not found' warning, try to copy the .blender
+dir to one of these locations (your home directory being recommended).
+
+
+
+-------------------------------------Links--------------------------------------
+
+Getting Involved:
+http://www.blender.org/community/get-involved
+
+Community:
+http://www.blender.org/Community
+
+Main blender development site:
+http://www.blender.org
+
+The Blender project homepage:
+http://projects.blender.org/projects/bf-blender
+
+Documentation:
+http://www.blender.org/education-help
+
+Bug tracker:
+http://www.blender.org/development/report-a-bug
+
+Feature request tracker:
+http://wiki.blender.org/index.php/Requests
--- a/1091
+++ b/1091
--- a/bin/.blender/.Blanguages
+++ b/bin/.blender/.Blanguages
@@ -0,0 +1,23 @@
+English:en_US
+Japanese:ja_JP
+Dutch:nl_NL
+Italian:it_IT
+German:de_DE
+Finnish:fi_FI
+Swedish:sv_SE
+French:fr_FR
+Spanish:es_ES
+Catalan:ca_ES
+Czech:cs_CZ
+Brazilian Portuguese:pt_BR
+Simplified Chinese:zh_CN
+Russian:ru_RU
+Croatian:hr_HR
+Serbian:sr
+Ukrainian:uk_UA
+Polish:pl_PL
+Romanian:ro
+Arabic:ar
+Bulgarian:bg
+Greek:el
+Korean:ko
--- a/bin/.blender/.bfont.ttf
+++ b/bin/.blender/.bfont.ttf
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -0,0 +1,135 @@
+# $Id$
+# ***** 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) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+MESSAGE(STATUS "Configuring blenderplayer")
+
+SETUP_LIBDIRS()
+
+IF(WITH_QUICKTIME)
+  ADD_DEFINITIONS(-DWITH_QUICKTIME)
+ENDIF(WITH_QUICKTIME)
+
+IF(LINUX)
+  ADD_DEFINITIONS(-DWITH_BINRELOC)
+  INCLUDE_DIRECTORIES(${BINRELOC_INC})
+endif(LINUX)
+
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
+  COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
+  DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
+)
+
+IF(WIN32)
+  ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../source/icons/winblender.rc)
+ELSE(WIN32)
+  ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+ENDIF(WIN32)
+
+ADD_DEPENDENCIES(blenderplayer makesdna)
+
+FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
+
+SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
+
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+IF(UNIX)
+  # Sort libraries
+  SET(BLENDER_SORTED_LIBS
+    gp_ghost 
+    gp_common 
+    bf_string 
+    bf_ghost 
+    bf_blenkernel 
+    verse 
+    bf_blenkernel 
+    bf_blenloader 
+    bf_blenpluginapi 
+    bf_blroutines 
+    bf_converter 
+    bf_sumo 
+    bf_ketsji 
+    extern_solid 
+    extern_qhull 
+    bf_bullet 
+    bf_common 
+    bf_dummy 
+    bf_logic 
+    bf_rasterizer 
+    bf_oglrasterizer 
+    bf_expressions 
+    bf_scenegraph 
+	bf_IK
+    bf_moto 
+    bf_soundsystem 
+    bf_kernel 
+    bf_nodes
+	bf_gpu
+    bf_imbuf
+    bf_avi 
+    kx_network 
+    bf_ngnetwork 
+    bf_loopbacknetwork 
+    extern_bullet 
+    bf_guardedalloc 
+    bf_memutil 
+    bf_bmfont 
+    bf_blenlib 
+    bf_cineon 
+    bf_openexr 
+    extern_libopenjpeg 
+    bf_dds
+    bf_ftfont 
+    extern_ftgl 
+    bf_readblenfile 
+    blenkernel_blc
+    bf_quicktime
+    extern_binreloc
+	extern_glew
+  ) 
+
+  FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+    SET(REMLIB ${SORTLIB})
+    FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+      IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+        SET(REMLIB "")
+      ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+    ENDFOREACH(SEARCHLIB)
+    IF(REMLIB)
+      MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
+      LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+    ENDIF(REMLIB)
+  ENDFOREACH(SORTLIB)
+
+  TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS})
+ELSE(UNIX)
+  TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
+ENDIF(UNIX)
+
+SETUP_LIBLINKS(blenderplayer)
--- a/build_files/buildbot/config/user-config-i686.py
+++ b/build_files/buildbot/config/user-config-i686.py
@@ -1,130 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
-BF_NUMJOBS = 2
-
-# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3'
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = True
-BF_OPENCOLLADA = '/opt/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib32'
-BF_PCRE_LIB = ''
-BF_EXPAT_LIB = ''
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libfaad.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
-
-WITH_BF_GETTEXT_STATIC = True
-BF_FREETYPE_LIB_STATIC = True
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib32'
-
-WITH_BF_PNG = True
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_OGG = True
-
-WITH_BF_OPENMP = True
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Blender player (would be enabled in it's own config)
-WITH_BF_PLAYER = False
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/home/sources/staticlibs/spnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
-
-# FFT
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-
-# JACK
-WITH_BF_JACK = True
-
-# Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = True
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-
-WITH_BF_OIIO = True
-WITH_BF_STATICOIIO = True
-BF_OIIO = '/opt/oiio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# Ocean Simulation
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-O2']  # C & C++
-PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
--- a/build_files/buildbot/config/user-config-player-i686.py
+++ b/build_files/buildbot/config/user-config-player-i686.py
@@ -1,107 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
-BF_NUMJOBS = 2
-
-# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3'
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = False
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libfaad.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
-
-WITH_BF_GETTEXT_STATIC = True
-BF_FREETYPE_LIB_STATIC = True
-
-WITH_BF_OPENEXR = False
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = False
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib32'
-
-WITH_BF_PNG = True
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_OGG = False
-
-WITH_BF_OPENMP = True
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Do not build blender when building blenderplayer
-WITH_BF_NOBLENDER = True
-WITH_BF_PLAYER = True
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/home/sources/staticlibs/spnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-# JACK
-WITH_BF_JACK = True
-
-# Motion Tracking
-WITH_BF_LIBMV = False
-
-# Ocean Simulation
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-O2']  # C & C++
-PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']
--- a/build_files/buildbot/config/user-config-player-x86_64.py
+++ b/build_files/buildbot/config/user-config-player-x86_64.py
@@ -1,107 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
-BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
-BF_NUMJOBS = 2
-
-# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3'
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = False
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libfaad.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
-
-WITH_BF_GETTEXT_STATIC = True
-BF_FREETYPE_LIB_STATIC = True
-
-WITH_BF_OPENEXR = False
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = False
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_PNG = True
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_OGG = False
-
-WITH_BF_OPENMP = True
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Do not build blender when building blenderplayer
-WITH_BF_NOBLENDER = True
-WITH_BF_PLAYER = True
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/home/sources/staticlibs/spnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-# JACK
-WITH_BF_JACK = True
-
-# Motion Tracking
-WITH_BF_LIBMV = False
-
-# Ocean Simulation
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
--- a/build_files/buildbot/config/user-config-x86_64.py
+++ b/build_files/buildbot/config/user-config-x86_64.py
@@ -1,130 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
-BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
-BF_NUMJOBS = 2
-
-# Python configuration
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3'
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = True
-BF_OPENCOLLADA = '/opt/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
-BF_PCRE_LIB = ''
-BF_EXPAT_LIB = ''
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libfaad.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
-
-WITH_BF_GETTEXT_STATIC = True
-BF_FREETYPE_LIB_STATIC = True
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64'
-
-WITH_BF_PNG = True
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_OGG = True
-
-WITH_BF_OPENMP = True
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Blender player (would be enabled in it's own config)
-WITH_BF_PLAYER = False
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/home/sources/staticlibs/spnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
-
-# FFT
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-
-# JACK
-WITH_BF_JACK = True
-
-# Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = True
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-
-WITH_BF_OIIO = True
-WITH_BF_STATICOIIO = True
-BF_OIIO = '/opt/oiio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# Ocean Simulation
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -1,190 +0,0 @@
-# -*- python -*-
-# ex: set syntax=python:
-
-# <pep8 compliant>
-
-# Dictionary that the buildmaster pays attention to.
-c = BuildmasterConfig = {}
-
-# BUILD SLAVES
-#
-# We load the slaves and their passwords from a separator file, so we can have
-# this one in SVN.
-
-from buildbot.buildslave import BuildSlave
-import master_private
-
-c['slaves'] = []
-
-for slave in master_private.slaves:
-    c['slaves'].append(BuildSlave(slave['name'], slave['password']))
-
-# TCP port through which slaves connect
-
-c['slavePortnum'] = 9989
-
-# CHANGE SOURCES
-
-from buildbot.changes.svnpoller import SVNPoller
-
-c['change_source'] = SVNPoller(
-    'https://svn.blender.org/svnroot/bf-blender/trunk/',
-    pollinterval=1200)
-
-# BUILDERS
-#
-# The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
-# what steps, and which slaves can execute them.  Note that any particular build will
-# only take place on one slave.
-
-from buildbot.process.factory import BuildFactory
-from buildbot.steps.source import SVN
-from buildbot.steps.shell import ShellCommand
-from buildbot.steps.shell import Compile
-from buildbot.steps.shell import Test
-from buildbot.steps.transfer import FileUpload
-# from buildbot.steps.transfer import FileDownload
-from buildbot.steps.master import MasterShellCommand
-from buildbot.config import BuilderConfig
-
-# add builder utility
-
-c['builders'] = []
-buildernames = []
-
-
-def add_builder(c, name, libdir, factory, branch=''):
-    slavenames = []
-
-    for slave in master_private.slaves:
-        if name in slave['builders']:
-            slavenames.append(slave['name'])
-
-    if len(slavenames) > 0:
-        f = factory(name, libdir, branch)
-        c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender'))
-        buildernames.append(name)
-
-# common steps
-
-
-def svn_step(branch=''):
-    if branch:
-        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/branches/%%BRANCH%%', mode='update', defaultBranch=branch, workdir='blender')
-    else:
-        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
-
-
-def lib_svn_step(libdir):
-    return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir)
-
-# generic builder
-
-
-def generic_builder(idname, libdir='', branch=''):
-    filename = 'buildbot_upload_' + idname + '.zip'
-    compile_script = '../blender/build_files/buildbot/slave_compile.py'
-    test_script = '../blender/build_files/buildbot/slave_test.py'
-    pack_script = '../blender/build_files/buildbot/slave_pack.py'
-    unpack_script = 'master_unpack.py'
-
-    f = BuildFactory()
-    f.addStep(svn_step(branch))
-    if libdir != '':
-        f.addStep(lib_svn_step(libdir))
-
-    f.addStep(Compile(command=['python', compile_script, idname]))
-    f.addStep(Test(command=['python', test_script, idname]))
-    f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged'))
-    if 'cmake' in idname:
-        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
-    else:
-        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
-    f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
-    return f
-
-# builders
-
-add_builder(c, 'mac_x86_64_scons', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad')
-add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder)
-#add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
-add_builder(c, 'linux_i386_scons', '', generic_builder)
-add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad')
-add_builder(c, 'linux_x86_64_scons', '', generic_builder)
-add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win32_scons', 'windows', generic_builder)
-add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win64_scons', 'win64', generic_builder)
-add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
-add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
-#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
-#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
-
-# SCHEDULERS
-#
-# Decide how to react to incoming changes.
-
-# from buildbot.scheduler import Scheduler
-from buildbot.schedulers import timed
-
-c['schedulers'] = []
-#c['schedulers'].append(Scheduler(name="all", branch=None,
-#                                 treeStableTimer=None,
-#                                 builderNames=[]))
-#c['schedulers'].append(timed.Periodic(name="nightly",
-#                        builderNames=buildernames,
-#                        periodicBuildTimer=24*60*60))
-
-c['schedulers'].append(timed.Nightly(
-    name='nightly',
-    builderNames=buildernames,
-    hour=3,
-    minute=0))
-
-# STATUS TARGETS
-#
-# 'status' is a list of Status Targets. The results of each build will be
-# pushed to these targets. buildbot/status/*.py has a variety to choose from,
-# including web pages, email senders, and IRC bots.
-
-c['status'] = []
-
-from buildbot.status import html
-from buildbot.status.web import authz
-
-authz_cfg = authz.Authz(
-    # change any of these to True to enable; see the manual for more
-    # options
-    gracefulShutdown=False,
-    forceBuild=True,  # use this to test your slave once it is set up
-    forceAllBuilds=False,
-    pingBuilder=False,
-    stopBuild=False,
-    stopAllBuilds=False,
-    cancelPendingBuild=True,
-)
-
-c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
-
-# PROJECT IDENTITY
-
-c['projectName'] = "Blender"
-c['projectURL'] = "http://www.blender.org"
-
-# the 'buildbotURL' string should point to the location where the buildbot's
-# internal web server (usually the html.WebStatus page) is visible. This
-# typically uses the port number set in the Waterfall 'status' entry, but
-# with an externally-visible host name which the buildbot cannot figure out
-# without some help.
-
-c['buildbotURL'] = "http://builder.blender.org/"
-
-# DB URL
-#
-# This specifies what database buildbot uses to store change and scheduler
-# state.  You can leave this at its default for all but the largest
-# installations.
-
-c['db_url'] = "sqlite:///state.sqlite"
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -1,143 +0,0 @@
-# ##### 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# Runs on Buildbot master, to unpack incoming unload.zip into latest
-# builds directory and remove older builds.
-
-# <pep8 compliant>
-
-import os
-import shutil
-import sys
-import zipfile
-
-
-# extension stripping
-def strip_extension(filename):
-    extensions = '.zip', '.tar', '.bz2', '.gz', '.tgz', '.tbz', '.exe'
-    filename_noext, ext = os.path.splitext(filename)
-    if ext in extensions:
-        return strip_extension(filename_noext)  # may have .tar.bz2
-    else:
-        return filename
-
-
-# extract platform from package name
-def get_platform(filename):
-    # name is blender-version-platform.extension. we want to get the
-    # platform out, but there may be some variations, so we fiddle a
-    # bit to handle current and hopefully future names
-    filename = strip_extension(filename)
-    filename = strip_extension(filename)
-
-    tokens = filename.split("-")
-    platforms = ('osx', 'mac', 'bsd',
-                 'win', 'linux', 'source',
-                 'solaris',
-                 'mingw')
-    platform_tokens = []
-    found = False
-
-    for token in tokens:
-        if not found:
-            for platform in platforms:
-                if platform in token.lower():
-                    found = True
-                    break
-
-        if found:
-            platform_tokens += [token]
-
-    return '-'.join(platform_tokens)
-
-
-def get_branch(filename):
-    tokens = filename.split("-")
-    branch = ""
-
-    for token in tokens:
-        if branch == "":
-            branch = token
-        else:
-            branch = branch + "-" + token
-
-        if token == "blender":
-            return branch
-
-    return ""
-
-# get filename
-if len(sys.argv) < 2:
-    sys.stderr.write("Not enough arguments, expecting file to unpack\n")
-    sys.exit(1)
-
-filename = sys.argv[1]
-
-# open zip file
-if not os.path.exists(filename):
-    sys.stderr.write("File %r not found.\n" % filename)
-    sys.exit(1)
-
-try:
-    z = zipfile.ZipFile(filename, "r")
-except Exception, ex:
-    sys.stderr.write('Failed to open zip file: %s\n' % str(ex))
-    sys.exit(1)
-
-if len(z.namelist()) != 1:
-    sys.stderr.write("Expected one file in %r." % filename)
-    sys.exit(1)
-
-package = z.namelist()[0]
-packagename = os.path.basename(package)
-
-# detect platform and branch
-platform = get_platform(packagename)
-branch = get_branch(packagename)
-
-if platform == '':
-    sys.stderr.write('Failed to detect platform ' +
-                     'from package: %r\n' % packagename)
-    sys.exit(1)
-
-# extract
-directory = 'public_html/download'
-
-try:
-    zf = z.open(package)
-    f = file(os.path.join(directory, packagename), "wb")
-
-    shutil.copyfileobj(zf, f)
-
-    zf.close()
-    z.close()
-
-    os.remove(filename)
-except Exception, ex:
-    sys.stderr.write('Failed to unzip package: %s\n' % str(ex))
-    sys.exit(1)
-
-# remove other files from the same platform and branch
-try:
-    for f in os.listdir(directory):
-        if get_platform(f) == platform and get_branch(f) == branch:
-            if f != packagename:
-                os.remove(os.path.join(directory, f))
-except Exception, ex:
-    sys.stderr.write('Failed to remove old packages: %s\n' % str(ex))
-    sys.exit(1)
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -1,124 +0,0 @@
-# ##### 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import os
-import subprocess
-import sys
-
-# get builder name
-if len(sys.argv) < 2:
-    sys.stderr.write("Not enough arguments, expecting builder name\n")
-    sys.exit(1)
-
-builder = sys.argv[1]
-
-# we run from build/ directory
-blender_dir = '../blender'
-
-if builder.find('cmake') != -1:
-    # cmake
-
-    # set build options
-    cmake_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
-
-    if builder.endswith('mac_x86_64_cmake'):
-        cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
-    elif builder.endswith('mac_i386_cmake'):
-        cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=i386')
-    elif builder.endswith('mac_ppc_cmake'):
-        cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc')
-
-    # configure and make
-    retcode = subprocess.call(['cmake', blender_dir] + cmake_options)
-    if retcode != 0:
-        sys.exit(retcode)
-    retcode = subprocess.call(['make', '-s', '-j4', 'install'])
-    sys.exit(retcode)
-else:
-    # scons
-    os.chdir(blender_dir)
-    scons_cmd = ['python', 'scons/scons.py']
-    scons_options = ['BF_FANCY=False']
-
-    if builder.find('linux') != -1:
-        import shutil
-
-        # We're using the same rules as release builder, so tweak
-        # build and install dirs
-        build_dir = os.path.join('..', 'build', builder)
-        install_dir = os.path.join('..', 'install', builder)
-
-        common_options = ['BF_INSTALLDIR=' + install_dir] + scons_options
-
-        # Clean install directory so we'll be sure there's no
-        if os.path.isdir(install_dir):
-            shutil.rmtree(install_dir)
-
-        buildbot_dir = os.path.dirname(os.path.realpath(__file__))
-        config_dir = os.path.join(buildbot_dir, 'config')
-
-        configs = []
-        if builder.endswith('linux_x86_64_scons'):
-            configs = ['user-config-player-x86_64.py',
-                       'user-config-x86_64.py']
-        elif builder.endswith('linux_i386_scons'):
-            configs = ['user-config-player-i686.py',
-                       'user-config-i686.py']
-
-        for config in configs:
-            config_fpath = os.path.join(config_dir, config)
-
-            scons_options = []
-
-            if config.find('player') != -1:
-                scons_options.append('BF_BUILDDIR=%s_player' % (build_dir))
-            else:
-                scons_options.append('BF_BUILDDIR=%s' % (build_dir))
-
-            scons_options += common_options
-
-            if config.find('player') == -1:
-                scons_options.append('blender')
-            else:
-                scons_options.append('blenderplayer')
-
-            scons_options.append('BF_CONFIG=' + config_fpath)
-
-            retcode = subprocess.call(scons_cmd + scons_options)
-            if retcode != 0:
-                print('Error building rules wuth config ' + config)
-                sys.exit(retcode)
-
-        sys.exit(0)
-    else:
-        if builder.find('win') != -1:
-            bitness = '32'
-
-            if builder.find('win64') != -1:
-                bitness = '64'
-
-            scons_options.append('BF_BITNESS=' + bitness)
-            scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
-            scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
-            if builder.find('mingw') != -1:
-                scons_options.append('BF_TOOLSET=mingw')
-
-        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
-        sys.exit(retcode)
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -1,146 +0,0 @@
-# ##### 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-# Runs on buildbot slave, creating a release package using the build
-# system and zipping it into buildbot_upload.zip. This is then uploaded
-# to the master in the next buildbot step.
-
-import os
-import subprocess
-import sys
-import zipfile
-
-# get builder name
-if len(sys.argv) < 2:
-    sys.stderr.write("Not enough arguments, expecting builder name\n")
-    sys.exit(1)
-
-builder = sys.argv[1]
-branch = ''
-
-if len(sys.argv) >= 3:
-    branch = sys.argv[2]
-
-# scons does own packaging
-if builder.find('scons') != -1:
-    os.chdir('../blender')
-    scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False']
-
-    if builder.find('linux') != -1:
-        buildbot_dir = os.path.dirname(os.path.realpath(__file__))
-        config_dir = os.path.join(buildbot_dir, 'config')
-        build_dir = os.path.join('..', 'build', builder)
-        install_dir = os.path.join('..', 'install', builder)
-
-        scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False',
-                          'BF_BUILDDIR=' + build_dir,
-                          'BF_INSTALLDIR=' + install_dir,
-                          'WITHOUT_BF_INSTALL=True']
-
-        config = None
-        bits = None
-
-        if builder.endswith('linux_x86_64_scons'):
-            config = 'user-config-x86_64.py'
-            bits = 64
-        elif builder.endswith('linux_i386_scons'):
-            config = 'user-config-i686.py'
-            bits = 32
-
-        if config is not None:
-            config_fpath = os.path.join(config_dir, config)
-            scons_options.append('BF_CONFIG=' + config_fpath)
-
-        blender = os.path.join(install_dir, 'blender')
-        blenderplayer = os.path.join(install_dir, 'blenderplayer')
-        subprocess.call(['strip', '--strip-all', blender, blenderplayer])
-
-        extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
-        mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
-        software_gl = os.path.join(extra, 'blender-softwaregl')
-
-        os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
-        os.system('cp %s %s' % (software_gl, install_dir))
-        os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
-
-        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
-
-        sys.exit(retcode)
-    else:
-        if builder.find('win') != -1:
-            bitness = '32'
-
-            if builder.find('win64') != -1:
-                bitness = '64'
-
-            scons_options.append('BF_BITNESS=' + bitness)
-            scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
-            scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
-            if builder.find('mingw') != -1:
-                scons_options.append('BF_TOOLSET=mingw')
-
-        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
-        sys.exit(retcode)
-
-# clean release directory if it already exists
-release_dir = 'release'
-
-if os.path.exists(release_dir):
-    for f in os.listdir(release_dir):
-        if os.path.isfile(os.path.join(release_dir, f)):
-            os.remove(os.path.join(release_dir, f))
-
-# create release package
-try:
-    subprocess.call(['make', 'package_archive'])
-except Exception, ex:
-    sys.stderr.write('Make package release failed' + str(ex) + '\n')
-    sys.exit(1)
-
-# find release directory, must exist this time
-if not os.path.exists(release_dir):
-    sys.stderr.write("Failed to find release directory %r.\n" % release_dir)
-    sys.exit(1)
-
-# find release package
-file = None
-filepath = None
-
-for f in os.listdir(release_dir):
-    rf = os.path.join(release_dir, f)
-    if os.path.isfile(rf) and f.startswith('blender'):
-        file = f
-        filepath = rf
-
-if not file:
-    sys.stderr.write("Failed to find release package.\n")
-    sys.exit(1)
-
-# create zip file
-try:
-    upload_zip = "buildbot_upload.zip"
-    if os.path.exists(upload_zip):
-        os.remove(upload_zip)
-    z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)
-    z.write(filepath, arcname=file)
-    z.close()
-except Exception, ex:
-    sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
-    sys.exit(1)
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -1,40 +0,0 @@
-# ##### 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import subprocess
-import sys
-
-# get builder name
-if len(sys.argv) < 2:
-    sys.stderr.write("Not enough arguments, expecting builder name\n")
-    sys.exit(1)
-
-builder = sys.argv[1]
-
-# we run from build/ directory
-blender_dir = '../blender'
-
-if builder.find('cmake') != -1:
-    # cmake
-    retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
-    sys.exit(retcode)
-else:
-    # scons
-    pass
--- a/build_files/cmake/Modules/FindFftw3.cmake
+++ b/build_files/cmake/Modules/FindFftw3.cmake
@@ -1,70 +0,0 @@
-# - Find Fftw3 library
-# Find the native Fftw3 includes and library
-# This module defines
-#  FFTW3_INCLUDE_DIRS, where to find fftw3.h, Set when
-#                        FFTW3_INCLUDE_DIR is found.
-#  FFTW3_LIBRARIES, libraries to link against to use Fftw3.
-#  FFTW3_ROOT_DIR, The base directory to search for Fftw3.
-#                    This can also be an environment variable.
-#  FFTW3_FOUND, If false, do not try to use Fftw3.
-#
-# also defined, but not for general use are
-#  FFTW3_LIBRARY, where to find the Fftw3 library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If FFTW3_ROOT_DIR was defined in the environment, use it.
-IF(NOT FFTW3_ROOT_DIR AND NOT $ENV{FFTW3_ROOT_DIR} STREQUAL "")
-  SET(FFTW3_ROOT_DIR $ENV{FFTW3_ROOT_DIR})
-ENDIF()
-
-SET(_fftw3_SEARCH_DIRS
-  ${FFTW3_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(FFTW3_INCLUDE_DIR
-  NAMES
-    fftw3.h
-  HINTS
-    ${_fftw3_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(FFTW3_LIBRARY
-  NAMES
-    fftw3
-  HINTS
-    ${_fftw3_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG
-    FFTW3_LIBRARY FFTW3_INCLUDE_DIR)
-
-IF(FFTW3_FOUND)
-  SET(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
-  SET(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
-ENDIF(FFTW3_FOUND)
-
-MARK_AS_ADVANCED(
-  FFTW3_INCLUDE_DIR
-  FFTW3_LIBRARY
-)
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@ -1,59 +0,0 @@
-#
-# Try to find GLEW library and include path.
-# Once done this will define
-#
-# GLEW_FOUND
-# GLEW_INCLUDE_PATH
-# GLEW_LIBRARY
-# 
-
-IF (WIN32)
-	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
-		$ENV{PROGRAMFILES}/GLEW/include
-		${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
-		DOC "The directory where GL/glew.h resides")
-	IF (NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-		FIND_LIBRARY( GLEW_LIBRARY
-			NAMES glew64 glew64s
-			PATHS
-			$ENV{PROGRAMFILES}/GLEW/lib
-			${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
-			${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
-			DOC "The GLEW library (64-bit)"
-		)
-	ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-		FIND_LIBRARY( GLEW_LIBRARY
-			NAMES glew GLEW glew32 glew32s
-			PATHS
-			$ENV{PROGRAMFILES}/GLEW/lib
-			${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
-			${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
-			DOC "The GLEW library"
-		)
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-ELSE (WIN32)
-	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
-		/usr/include
-		/usr/local/include
-		/sw/include
-		/opt/local/include
-		DOC "The directory where GL/glew.h resides")
-	FIND_LIBRARY( GLEW_LIBRARY
-		NAMES GLEW glew
-		PATHS
-		/usr/lib64
-		/usr/lib
-		/usr/local/lib64
-		/usr/local/lib
-		/sw/lib
-		/opt/local/lib
-		DOC "The GLEW library")
-ENDIF (WIN32)
-
-IF (GLEW_INCLUDE_PATH)
-	SET(GLEW_FOUND TRUE)
-ELSE (GLEW_INCLUDE_PATH)
-	SET(GLEW_FOUND FALSE)
-ENDIF (GLEW_INCLUDE_PATH)
-
-MARK_AS_ADVANCED( GLEW_FOUND )
--- a/build_files/cmake/Modules/FindJack.cmake
+++ b/build_files/cmake/Modules/FindJack.cmake
@@ -1,70 +0,0 @@
-# - Find Jack library
-# Find the native Jack includes and library
-# This module defines
-#  JACK_INCLUDE_DIRS, where to find jack.h, Set when
-#                        JACK_INCLUDE_DIR is found.
-#  JACK_LIBRARIES, libraries to link against to use Jack.
-#  JACK_ROOT_DIR, The base directory to search for Jack.
-#                    This can also be an environment variable.
-#  JACK_FOUND, If false, do not try to use Jack.
-#
-# also defined, but not for general use are
-#  JACK_LIBRARY, where to find the Jack library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If JACK_ROOT_DIR was defined in the environment, use it.
-IF(NOT JACK_ROOT_DIR AND NOT $ENV{JACK_ROOT_DIR} STREQUAL "")
-  SET(JACK_ROOT_DIR $ENV{JACK_ROOT_DIR})
-ENDIF()
-
-SET(_jack_SEARCH_DIRS
-  ${JACK_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(JACK_INCLUDE_DIR
-  NAMES
-    jack.h
-  HINTS
-    ${_jack_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include/jack
-)
-
-FIND_LIBRARY(JACK_LIBRARY
-  NAMES
-    jack
-  HINTS
-    ${_jack_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG
-    JACK_LIBRARY JACK_INCLUDE_DIR)
-
-IF(JACK_FOUND)
-  SET(JACK_LIBRARIES ${JACK_LIBRARY})
-  SET(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR})
-ENDIF(JACK_FOUND)
-
-MARK_AS_ADVANCED(
-  JACK_INCLUDE_DIR
-  JACK_LIBRARY
-)
--- a/build_files/cmake/Modules/FindJeMalloc.cmake
+++ b/build_files/cmake/Modules/FindJeMalloc.cmake
@@ -1,70 +0,0 @@
-# - Find JeMalloc library
-# Find the native JeMalloc includes and library
-# This module defines
-#  JEMALLOC_INCLUDE_DIRS, where to find jemalloc.h, Set when
-#                        JEMALLOC_INCLUDE_DIR is found.
-#  JEMALLOC_LIBRARIES, libraries to link against to use JeMalloc.
-#  JEMALLOC_ROOT_DIR, The base directory to search for JeMalloc.
-#                    This can also be an environment variable.
-#  JEMALLOC_FOUND, If false, do not try to use JeMalloc.
-#
-# also defined, but not for general use are
-#  JEMALLOC_LIBRARY, where to find the JeMalloc library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If JEMALLOC_ROOT_DIR was defined in the environment, use it.
-IF(NOT JEMALLOC_ROOT_DIR AND NOT $ENV{JEMALLOC_ROOT_DIR} STREQUAL "")
-  SET(JEMALLOC_ROOT_DIR $ENV{JEMALLOC_ROOT_DIR})
-ENDIF()
-
-SET(_jemalloc_SEARCH_DIRS
-  ${JEMALLOC_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(JEMALLOC_INCLUDE_DIR
-  NAMES
-    jemalloc.h
-  HINTS
-    ${_jemalloc_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include/jemalloc
-)
-
-FIND_LIBRARY(JEMALLOC_LIBRARY
-  NAMES
-    jemalloc
-  HINTS
-    ${_jemalloc_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG
-    JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR)
-
-IF(JEMALLOC_FOUND)
-  SET(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY})
-  SET(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
-ENDIF(JEMALLOC_FOUND)
-
-MARK_AS_ADVANCED(
-  JEMALLOC_INCLUDE_DIR
-  JEMALLOC_LIBRARY
-)
--- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake
+++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake
@@ -1,141 +0,0 @@
-# - Find OpenCOLLADA library
-# Find the native OpenCOLLADA includes and library
-# This module defines
-#  OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and 
-#                 COLLADAFramework/, Set when OPENCOLLADA_INCLUDE_DIR is found.
-#  OPENCOLLADA_LIBRARIES, libraries to link against to use OpenCOLLADA.
-#  OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
-#                    This can also be an environment variable.
-#  OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA.
-#
-# also defined, but not for general use are
-#  OPENCOLLADA_LIBRARY, where to find the OpenCOLLADA library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# note about include paths, there are 2 ways includes are set
-#
-# Where '/usr/include/opencollada' is the root dir:
-#   /usr/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h
-#
-# Where '/opt/opencollada' is the base dir:
-# /opt/opencollada/COLLADABaseUtils/include/COLLADABUPlatform.h
-
-# If OPENCOLLADA_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENCOLLADA_ROOT_DIR AND NOT $ENV{OPENCOLLADA_ROOT_DIR} STREQUAL "")
-  SET(OPENCOLLADA_ROOT_DIR $ENV{OPENCOLLADA_ROOT_DIR})
-ENDIF()
-
-SET(_opencollada_FIND_INCLUDES
-  COLLADAStreamWriter
-  COLLADABaseUtils
-  COLLADAFramework
-  COLLADASaxFrameworkLoader
-  GeneratedSaxParser
-)
-
-SET(_opencollada_FIND_COMPONENTS
-  OpenCOLLADAStreamWriter
-  OpenCOLLADASaxFrameworkLoader
-  OpenCOLLADAFramework
-  OpenCOLLADABaseUtils
-  GeneratedSaxParser
-  MathMLSolver
-)
-
-# Fedora openCOLLADA package links these statically
-# note that order is important here ot it wont link
-SET(_opencollada_FIND_STATIC_COMPONENTS
-  buffer
-  ftoa
-  UTF
-)
-
-SET(_opencollada_SEARCH_DIRS
-  ${OPENCOLLADA_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-SET(_opencollada_INCLUDES)
-FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  # need to use this even thouh we are looking for a dir
-  FIND_FILE(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR
-    NAMES
-      ${COMPONENT}/include
-      ${COMPONENT}
-      # Ubuntu ppa needs this.
-      # Alternative would be to suffix all members of search path
-      # but this is less trouble, just looks strange.
-      include/opencollada/${COMPONENT}
-      include/${COMPONENT}/include
-    HINTS
-      ${_opencollada_SEARCH_DIRS}
-    )
-  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR)
-  LIST(APPEND _opencollada_INCLUDES "${OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR}")
-ENDFOREACH()
-
-
-SET(_opencollada_LIBRARIES)
-FOREACH(COMPONENT ${_opencollada_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_opencollada_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-      # Ubuntu ppa needs this.
-      lib64/opencollada lib/opencollada
-    )
-  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
-  LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_opencollada_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-      # Ubuntu ppa needs this.
-      lib64/opencollada lib/opencollada
-    )
-  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
-  IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
-    LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
-  ENDIF()
-ENDFOREACH()
-
-
-# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA  DEFAULT_MSG
-    _opencollada_LIBRARIES _opencollada_INCLUDES)
-
-
-IF(OPENCOLLADA_FOUND)
-  SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES})
-  SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES})
-ENDIF(OPENCOLLADA_FOUND)
--- a/build_files/cmake/Modules/FindOpenColorIO.cmake
+++ b/build_files/cmake/Modules/FindOpenColorIO.cmake
@@ -1,85 +0,0 @@
-# - Find OpenColorIO library
-# Find the native OpenColorIO includes and library
-# This module defines
-#  OPENCOLORIO_INCLUDE_DIRS, where to find OpenColorIO.h, Set when
-#                            OPENCOLORIO_INCLUDE_DIR is found.
-#  OPENCOLORIO_LIBRARIES, libraries to link against to use OpenColorIO.
-#  OPENCOLORIO_ROOT_DIR, The base directory to search for OpenColorIO.
-#                        This can also be an environment variable.
-#  OPENCOLORIO_FOUND, If false, do not try to use OpenColorIO.
-#
-# also defined, but not for general use are
-#  OPENCOLORIO_LIBRARY, where to find the OpenColorIO library.
-
-#=============================================================================
-# Copyright 2012 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENCOLORIO_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENCOLORIO_ROOT_DIR AND NOT $ENV{OPENCOLORIO_ROOT_DIR} STREQUAL "")
-  SET(OPENCOLORIO_ROOT_DIR $ENV{OPENCOLORIO_ROOT_DIR})
-ENDIF()
-
-SET(_opencolorio_FIND_COMPONENTS
-  OpenColorIO
-  yaml-cpp
-  tinyxml
-)
-
-SET(_opencolorio_SEARCH_DIRS
-  ${OPENCOLORIO_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(OPENCOLORIO_INCLUDE_DIR
-  NAMES
-    OpenColorIO/OpenColorIO.h
-  HINTS
-    ${_opencolorio_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-SET(_opencolorio_LIBRARIES)
-FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_opencolorio_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-  if(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY)
-    LIST(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}")
-  endif()
-ENDFOREACH()
-
-# handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenColorIO DEFAULT_MSG
-    _opencolorio_LIBRARIES OPENCOLORIO_INCLUDE_DIR)
-
-IF(OPENCOLORIO_FOUND)
-  SET(OPENCOLORIO_LIBRARIES ${_opencolorio_LIBRARIES})
-  SET(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_INCLUDE_DIR})
-ENDIF(OPENCOLORIO_FOUND)
-
-MARK_AS_ADVANCED(
-  OPENCOLORIO_INCLUDE_DIR
-  OPENCOLORIO_LIBRARY
-)
-
--- a/build_files/cmake/Modules/FindOpenEXR.cmake
+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
@@ -1,92 +0,0 @@
-# - Find OpenEXR library
-# Find the native OpenEXR includes and library
-# This module defines
-#  OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
-#                        OPENEXR_INCLUDE_DIR is found.
-#  OPENEXR_LIBRARIES, libraries to link against to use OpenEXR.
-#  OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
-#                    This can also be an environment variable.
-#  OPENEXR_FOUND, If false, do not try to use OpenEXR.
-#
-# For individual library access these advanced settings are available
-#  OPENEXR_HALF_LIBRARY, Path to Half library
-#  OPENEXR_IEX_LIBRARY, Path to Half library
-#  OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
-#  OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
-#  OPENEXR_IMATH_LIBRARY, Path to Imath library
-#
-# also defined, but not for general use are
-#  OPENEXR_LIBRARY, where to find the OpenEXR library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENEXR_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
-  SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
-ENDIF()
-
-SET(_openexr_FIND_COMPONENTS
-  Half
-  Iex
-  IlmImf
-  IlmThread
-  Imath
-)
-
-SET(_openexr_SEARCH_DIRS
-  ${OPENEXR_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(OPENEXR_INCLUDE_DIR
-  NAMES
-    ImfXdr.h
-  HINTS
-    ${_openexr_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include/OpenEXR
-)
-
-SET(_openexr_LIBRARIES)
-FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_openexr_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-  LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR  DEFAULT_MSG
-    _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
-
-IF(OPENEXR_FOUND)
-  SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
-ENDIF()
-
-MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)
-FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-  MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
-ENDFOREACH()
--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
+++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
@@ -1,70 +0,0 @@
-# - Find OpenImageIO library
-# Find the native OpenImageIO includes and library
-# This module defines
-#  OPENIMAGEIO_INCLUDE_DIRS, where to find openimageio.h, Set when
-#                            OPENIMAGEIO_INCLUDE_DIR is found.
-#  OPENIMAGEIO_LIBRARIES, libraries to link against to use OpenImageIO.
-#  OPENIMAGEIO_ROOT_DIR, The base directory to search for OpenImageIO.
-#                        This can also be an environment variable.
-#  OPENIMAGEIO_FOUND, If false, do not try to use OpenImageIO.
-#
-# also defined, but not for general use are
-#  OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENIMAGEIO_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENIMAGEIO_ROOT_DIR AND NOT $ENV{OPENIMAGEIO_ROOT_DIR} STREQUAL "")
-  SET(OPENIMAGEIO_ROOT_DIR $ENV{OPENIMAGEIO_ROOT_DIR})
-ENDIF()
-
-SET(_openimageio_SEARCH_DIRS
-  ${OPENIMAGEIO_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(OPENIMAGEIO_INCLUDE_DIR
-  NAMES
-    OpenImageIO/imageio.h
-  HINTS
-    ${_openimageio_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(OPENIMAGEIO_LIBRARY
-  NAMES
-    OpenImageIO
-  HINTS
-    ${_openimageio_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG
-    OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
-
-IF(OPENIMAGEIO_FOUND)
-  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
-  SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
-ENDIF(OPENIMAGEIO_FOUND)
-
-MARK_AS_ADVANCED(
-  OPENIMAGEIO_INCLUDE_DIR
-  OPENIMAGEIO_LIBRARY
-)
--- a/build_files/cmake/Modules/FindOpenJPEG.cmake
+++ b/build_files/cmake/Modules/FindOpenJPEG.cmake
@@ -1,70 +0,0 @@
-# - Find OpenJPEG library
-# Find the native OpenJPEG includes and library
-# This module defines
-#  OPENJPEG_INCLUDE_DIRS, where to find openjpeg.h, Set when
-#                        OPENJPEG_INCLUDE_DIR is found.
-#  OPENJPEG_LIBRARIES, libraries to link against to use OpenJPEG.
-#  OPENJPEG_ROOT_DIR, The base directory to search for OpenJPEG.
-#                    This can also be an environment variable.
-#  OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
-#
-# also defined, but not for general use are
-#  OPENJPEG_LIBRARY, where to find the OpenJPEG library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENJPEG_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENJPEG_ROOT_DIR AND NOT $ENV{OPENJPEG_ROOT_DIR} STREQUAL "")
-  SET(OPENJPEG_ROOT_DIR $ENV{OPENJPEG_ROOT_DIR})
-ENDIF()
-
-SET(_openjpeg_SEARCH_DIRS
-  ${OPENJPEG_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(OPENJPEG_INCLUDE_DIR
-  NAMES
-    openjpeg.h
-  HINTS
-    ${_openjpeg_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(OPENJPEG_LIBRARY
-  NAMES
-    openjpeg
-  HINTS
-    ${_openjpeg_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenJPEG DEFAULT_MSG
-    OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)
-
-IF(OPENJPEG_FOUND)
-  SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-  SET(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR})
-ENDIF(OPENJPEG_FOUND)
-
-MARK_AS_ADVANCED(
-  OPENJPEG_INCLUDE_DIR
-  OPENJPEG_LIBRARY
-)
--- a/build_files/cmake/Modules/FindPCRE.cmake
+++ b/build_files/cmake/Modules/FindPCRE.cmake
@@ -1,69 +0,0 @@
-# - Find PCRE library
-# Find the native PCRE includes and library
-# This module defines
-#  PCRE_INCLUDE_DIRS, where to find pcre.h, Set when
-#                     PCRE_INCLUDE_DIR is found.
-#  PCRE_LIBRARIES, libraries to link against to use PCRE.
-#  PCRE_ROOT_DIR, The base directory to search for PCRE.
-#                 This can also be an environment variable.
-#  PCRE_FOUND, If false, do not try to use PCRE.
-#
-# also defined, but not for general use are
-#  PCRE_LIBRARY, where to find the PCRE library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If PCRE_ROOT_DIR was defined in the environment, use it.
-IF(NOT PCRE_ROOT_DIR AND NOT $ENV{PCRE_ROOT_DIR} STREQUAL "")
-  SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR})
-ENDIF()
-
-SET(_pcre_SEARCH_DIRS
-  ${PCRE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(PCRE_INCLUDE_DIR pcre.h
-  HINTS
-    ${_pcre_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-    include
-)
-
-FIND_LIBRARY(PCRE_LIBRARY
-  NAMES
-    pcre
-  HINTS
-    ${_pcre_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG
-    PCRE_LIBRARY PCRE_INCLUDE_DIR)
-
-IF(PCRE_FOUND)
-  SET(PCRE_LIBRARIES ${PCRE_LIBRARY})
-  SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR})
-ENDIF(PCRE_FOUND)
-
-MARK_AS_ADVANCED(
-  PCRE_INCLUDE_DIR
-  PCRE_LIBRARY
-)
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -1,147 +0,0 @@
-# - Find Python libraries
-# Find the native Python includes and library
-#
-# Note:, This is not _yet_ intended to be a general python module for other
-#  projects to use since its hard coded to python 3.2 as blender only supports
-#  a single python version.
-#  This is for blender/unix python only.
-#
-# This module defines
-#  PYTHON_VERSION
-#  PYTHON_INCLUDE_DIRS
-#  PYTHON_LIBRARIES
-#  PYTHON_LIBPATH, Used for installation
-#  PYTHON_LINKFLAGS
-#  PYTHON_ROOT_DIR, The base directory to search for Python.
-#                   This can also be an environment variable.
-#
-# also defined, but not for general use are
-#  PYTHON_LIBRARY, where to find the python library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If PYTHON_ROOT_DIR was defined in the environment, use it.
-IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} STREQUAL "")
-  SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
-ENDIF()
-
-SET(PYTHON_VERSION 3.2 CACHE STRING "Python Version (major and minor only)")
-MARK_AS_ADVANCED(PYTHON_VERSION)
-
-
-# See: http://docs.python.org/extending/embedding.html#linking-requirements
-#      for why this is needed
-SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic" CACHE STRING "Linker flags for python")
-MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
-
-
-# if the user passes these defines as args, we dont want to overwrite
-SET(_IS_INC_DEF OFF)
-SET(_IS_LIB_DEF OFF)
-IF(DEFINED PYTHON_INCLUDE_DIR)
-  SET(_IS_INC_DEF ON)
-ENDIF()
-IF(DEFINED PYTHON_LIBRARY)
-  SET(_IS_LIB_DEF ON)
-ENDIF()
-
-
-# only search for the dirs if we havn't already
-IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF))
-
-  SET(_python_ABI_FLAGS
-    "m;mu;u; "    # release
-    "md;mud;ud;d" # debug
-  )
-
-  STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
-
-  SET(_python_SEARCH_DIRS
-    ${PYTHON_ROOT_DIR}
-    "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
-    "/opt/py${_PYTHON_VERSION_NO_DOTS}"
-  )
-
-  FOREACH(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS})
-    #IF(CMAKE_BUILD_TYPE STREQUAL Debug)
-    #  SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
-    #ENDIF()
-    STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
-
-    IF(NOT DEFINED PYTHON_INCLUDE_DIR)
-      FIND_PATH(PYTHON_INCLUDE_DIR
-        NAMES
-          Python.h
-        HINTS
-          ${_python_SEARCH_DIRS}
-        PATH_SUFFIXES
-          include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
-      )
-    ENDIF()
-
-    IF(NOT DEFINED PYTHON_LIBRARY)
-      FIND_LIBRARY(PYTHON_LIBRARY
-        NAMES
-          "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
-        HINTS
-          ${_python_SEARCH_DIRS}
-        PATH_SUFFIXES
-          lib64 lib
-      )
-    ENDIF()
-
-    IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
-      break()
-    ELSE()
-      # ensure we dont find values from 2 different ABI versions
-      IF(NOT _IS_INC_DEF)
-        UNSET(PYTHON_INCLUDE_DIR CACHE)
-      ENDIF()
-      IF(NOT _IS_LIB_DEF)
-        UNSET(PYTHON_LIBRARY CACHE)
-      ENDIF()
-    ENDIF()
-  ENDFOREACH()
-
-  UNSET(_CURRENT_ABI_FLAGS)
-  UNSET(_CURRENT_PATH)
-
-  UNSET(_python_ABI_FLAGS)
-  UNSET(_python_SEARCH_DIRS)
-ENDIF()
-
-UNSET(_IS_INC_DEF)
-UNSET(_IS_LIB_DEF)
-
-# handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix  DEFAULT_MSG
-    PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
-
-
-IF(PYTHONLIBSUNIX_FOUND)
-  # Assign cache items
-  SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
-  SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
-
-  # we need this for installation
-  GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
-
-  # not used
-  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-ENDIF()
-
-MARK_AS_ADVANCED(
-  PYTHON_INCLUDE_DIR
-  PYTHON_LIBRARY
-)
--- a/build_files/cmake/Modules/FindSndFile.cmake
+++ b/build_files/cmake/Modules/FindSndFile.cmake
@@ -1,68 +0,0 @@
-# - Find SndFile library
-# Find the native SndFile includes and library
-# This module defines
-#  SNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when
-#                        SNDFILE_INCLUDE_DIR is found.
-#  SNDFILE_LIBRARIES, libraries to link against to use SndFile.
-#  SNDFILE_ROOT_DIR, The base directory to search for SndFile.
-#                    This can also be an environment variable.
-#  SNDFILE_FOUND, If false, do not try to use SndFile.
-#
-# also defined, but not for general use are
-#  SNDFILE_LIBRARY, where to find the SndFile library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If SNDFILE_ROOT_DIR was defined in the environment, use it.
-IF(NOT SNDFILE_ROOT_DIR AND NOT $ENV{SNDFILE_ROOT_DIR} STREQUAL "")
-  SET(SNDFILE_ROOT_DIR $ENV{SNDFILE_ROOT_DIR})
-ENDIF()
-
-SET(_sndfile_SEARCH_DIRS
-  ${SNDFILE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(SNDFILE_INCLUDE_DIR sndfile.h
-  HINTS
-    ${_sndfile_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(SNDFILE_LIBRARY
-  NAMES
-    sndfile
-  HINTS
-    ${_sndfile_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG
-    SNDFILE_LIBRARY SNDFILE_INCLUDE_DIR)
-
-IF(SNDFILE_FOUND)
-  SET(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY})
-  SET(SNDFILE_INCLUDE_DIRS ${SNDFILE_INCLUDE_DIR})
-ENDIF(SNDFILE_FOUND)
-
-MARK_AS_ADVANCED(
-  SNDFILE_INCLUDE_DIR
-  SNDFILE_LIBRARY
-)
--- a/build_files/cmake/Modules/FindSpacenav.cmake
+++ b/build_files/cmake/Modules/FindSpacenav.cmake
@@ -1,70 +0,0 @@
-# - Find Spacenav library
-# Find the native Spacenav includes and library
-# This module defines
-#  SPACENAV_INCLUDE_DIRS, where to find spnav.h, Set when
-#                        SPACENAV_INCLUDE_DIR is found.
-#  SPACENAV_LIBRARIES, libraries to link against to use Spacenav.
-#  SPACENAV_ROOT_DIR, The base directory to search for Spacenav.
-#                    This can also be an environment variable.
-#  SPACENAV_FOUND, If false, do not try to use Spacenav.
-#
-# also defined, but not for general use are
-#  SPACENAV_LIBRARY, where to find the Spacenav library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If SPACENAV_ROOT_DIR was defined in the environment, use it.
-IF(NOT SPACENAV_ROOT_DIR AND NOT $ENV{SPACENAV_ROOT_DIR} STREQUAL "")
-  SET(SPACENAV_ROOT_DIR $ENV{SPACENAV_ROOT_DIR})
-ENDIF()
-
-SET(_spacenav_SEARCH_DIRS
-  ${SPACENAV_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(SPACENAV_INCLUDE_DIR
-  NAMES
-    spnav.h
-  HINTS
-    ${_spacenav_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(SPACENAV_LIBRARY
-  NAMES
-    spnav
-  HINTS
-    ${_spacenav_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Spacenav DEFAULT_MSG
-    SPACENAV_LIBRARY SPACENAV_INCLUDE_DIR)
-
-IF(SPACENAV_FOUND)
-  SET(SPACENAV_LIBRARIES ${SPACENAV_LIBRARY})
-  SET(SPACENAV_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIR})
-ENDIF(SPACENAV_FOUND)
-
-MARK_AS_ADVANCED(
-  SPACENAV_INCLUDE_DIR
-  SPACENAV_LIBRARY
-)
--- a/build_files/cmake/Modules/FindXML2.cmake
+++ b/build_files/cmake/Modules/FindXML2.cmake
@@ -1,68 +0,0 @@
-# - Find XML2 library
-# Find the native XML2 includes and library
-# This module defines
-#  XML2_INCLUDE_DIRS, where to find xml2.h, Set when
-#                     XML2_INCLUDE_DIR is found.
-#  XML2_LIBRARIES, libraries to link against to use XML2.
-#  XML2_ROOT_DIR, The base directory to search for XML2.
-#                 This can also be an environment variable.
-#  XML2_FOUND, If false, do not try to use XML2.
-#
-# also defined, but not for general use are
-#  XML2_LIBRARY, where to find the XML2 library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If XML2_ROOT_DIR was defined in the environment, use it.
-IF(NOT XML2_ROOT_DIR AND NOT $ENV{XML2_ROOT_DIR} STREQUAL "")
-  SET(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR})
-ENDIF()
-
-SET(_xml2_SEARCH_DIRS
-  ${XML2_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h
-  HINTS
-    ${_xml2_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(XML2_LIBRARY
-  NAMES
-    xml2
-  HINTS
-    ${_xml2_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XML2 DEFAULT_MSG
-    XML2_LIBRARY XML2_INCLUDE_DIR)
-
-IF(XML2_FOUND)
-  SET(XML2_LIBRARIES ${XML2_LIBRARY})
-  SET(XML2_INCLUDE_DIRS ${XML2_INCLUDE_DIR})
-ENDIF(XML2_FOUND)
-
-MARK_AS_ADVANCED(
-  XML2_INCLUDE_DIR
-  XML2_LIBRARY
-)
--- a/build_files/cmake/RpmBuild.cmake
+++ b/build_files/cmake/RpmBuild.cmake
@@ -1,26 +0,0 @@
-#
-# VLMC RPM Finder
-# Authors: Rohit Yadav <rohityadav89@gmail.com>
-#
-
-if(NOT DEFINED RPMBUILD)
-
-	find_program(RPMBUILD
-		NAMES rpmbuild
-		PATHS "/usr/bin")
-
-	mark_as_advanced(RPMBUILD)
-
-	if(RPMBUILD)
-		message(STATUS "RPM Build Found: ${RPMBUILD}")
-	else() 
-		message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
-	endif()
-
-endif()
-
-if(RPMBUILD)
-	set(RPMBUILD_FOUND TRUE)
-else() 
-	set(RPMBUILD_FOUND FALSE)
-endif()
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -1,39 +0,0 @@
-# This is called by cmake as an extermal process from
-# ./source/creator/CMakeLists.txt to write ./source/creator/buildinfo.h
-
-# The FindSubversion.cmake module is part of the standard distribution
-include(FindSubversion)
-
-# Extract working copy information for SOURCE_DIR into MY_XXX variables
-# with a default in case anything fails, for examble when using git-svn
-set(MY_WC_REVISION "unknown")
-# Guess if this is a SVN working copy and then look up the revision
-if(EXISTS ${SOURCE_DIR}/.svn/)
-	if(Subversion_FOUND)
-		Subversion_WC_INFO(${SOURCE_DIR} MY)
-	endif()
-endif()
-
-# BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
-# but BUILD_DATE and BUILD_TIME are plataform dependant
-if(UNIX)
-	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-	execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-if(WIN32)
-	execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-	execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-
-# Write a file with the SVNVERSION define
-file(WRITE buildinfo.h.txt
-	"#define BUILD_REV \"${MY_WC_REVISION}\"\n"
-	"#define BUILD_DATE \"${BUILD_DATE}\"\n"
-	"#define BUILD_TIME \"${BUILD_TIME}\"\n"
-)
-
-# Copy the file to the final header only if the version changes
-# and avoid needless rebuilds
-# TODO: verify this comment is true, as BUILD_TIME probably changes
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        buildinfo.h.txt buildinfo.h)
--- a/build_files/cmake/clang_array_check.py
+++ b/build_files/cmake/clang_array_check.py
@@ -1,353 +0,0 @@
-# ---
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# ---
-# by Campbell Barton
-
-"""
-Invocation:
-
-   export CLANG_BIND_DIR="/dsk/src/llvm/tools/clang/bindings/python"
-   export CLANG_LIB_DIR="/opt/llvm/lib"
-
-   python2 clang_array_check.py somefile.c -DSOME_DEFINE -I/some/include
-
-... defines and includes are optional
-
-"""
-
-# delay parsing functions until we need them
-USE_LAZY_INIT = True
-
-# -----------------------------------------------------------------------------
-# predefined function/arg sizes, handy sometimes, but not complete...
-
-defs_precalc = {
-    "glColor3bv": {0: 3},
-    "glColor4bv": {0: 4},
-
-    "glColor3ubv": {0: 3},
-    "glColor4ubv": {0: 4},
-
-    "glColor4usv": {0: 3},
-    "glColor4usv": {0: 4},
-
-    "glColor3fv": {0: 3},
-    "glColor4fv": {0: 4},
-
-    "glColor3dv": {0: 3},
-    "glColor4dv": {0: 4},
-    
-    "glVertex2fv": {0: 2},
-    "glVertex3fv": {0: 3},
-    "glVertex4fv": {0: 4},
-
-    "glEvalCoord1fv": {0: 1},
-    "glEvalCoord1dv": {0: 1},
-    "glEvalCoord2fv": {0: 2},
-    "glEvalCoord2dv": {0: 2},
-    
-    "glRasterPos2dv": {0: 2},
-    "glRasterPos3dv": {0: 3},
-    "glRasterPos4dv": {0: 4},
-    
-    "glRasterPos2fv": {0: 2},
-    "glRasterPos3fv": {0: 3},
-    "glRasterPos4fv": {0: 4},
-    
-    "glRasterPos2sv": {0: 2},
-    "glRasterPos3sv": {0: 3},
-    "glRasterPos4sv": {0: 4},
-    
-    "glTexCoord2fv": {0: 2},
-    "glTexCoord3fv": {0: 3},
-    "glTexCoord4fv": {0: 4},
-    
-    "glTexCoord2dv": {0: 2},
-    "glTexCoord3dv": {0: 3},
-    "glTexCoord4dv": {0: 4},
-    
-    "glNormal3fv": {0: 3},
-    "glNormal3dv": {0: 3},
-    "glNormal3bv": {0: 3},
-    "glNormal3iv": {0: 3},
-    "glNormal3sv": {0: 3},
-}
-
-# -----------------------------------------------------------------------------
-
-import sys
-
-if 0:
-    # Examples with LLVM as the root dir: '/dsk/src/llvm'
-    
-    # path containing 'clang/__init__.py'
-    CLANG_BIND_DIR = "/dsk/src/llvm/tools/clang/bindings/python"
-    
-    # path containing libclang.so
-    CLANG_LIB_DIR = "/opt/llvm/lib"
-else:
-    import os
-    CLANG_BIND_DIR = os.environ.get("CLANG_BIND_DIR")
-    CLANG_LIB_DIR = os.environ.get("CLANG_LIB_DIR")
-    
-    if CLANG_BIND_DIR is None:
-        print("$CLANG_BIND_DIR python binding dir not set")
-    if CLANG_LIB_DIR is None:
-        print("$CLANG_LIB_DIR clang lib dir not set")
-
-sys.path.append(CLANG_BIND_DIR)
-
-import clang
-import clang.cindex
-from clang.cindex import (CursorKind,
-                          TypeKind,
-                          TokenKind)
-
-clang.cindex.Config.set_library_path(CLANG_LIB_DIR)
-
-index = clang.cindex.Index.create()
-
-args = sys.argv[2:]
-# print(args)
-
-tu = index.parse(sys.argv[1], args)
-print('Translation unit: %s' % tu.spelling)
-
-# -----------------------------------------------------------------------------
-
-
-def function_parm_wash_tokens(parm):
-    # print(parm.kind)
-    assert parm.kind in (CursorKind.PARM_DECL,
-                         CursorKind.VAR_DECL,  # XXX, double check this
-                         CursorKind.FIELD_DECL,
-                         )
-    
-    """
-    Return tolens without trailing commads and 'const'
-    """
-
-    tokens = [t for t in parm.get_tokens()]
-    if not tokens:
-        return tokens
-    
-    #if tokens[-1].kind == To
-    # remove trailing char
-    if tokens[-1].kind == TokenKind.PUNCTUATION:
-        if tokens[-1].spelling in (",", ")", ";"):
-            tokens.pop()
-        #else:
-        #    print(tokens[-1].spelling)
-
-    t_new = []
-    for t in tokens:
-        t_kind = t.kind
-        t_spelling = t.spelling
-        ok = True
-        if t_kind == TokenKind.KEYWORD:
-            if t_spelling in ("const", "restrict", "volatile"):
-                ok = False
-            elif t_spelling.startswith("__"):
-                ok = False  # __restrict
-        elif t_kind in (TokenKind.COMMENT, ):
-            ok = False
-            
-            # Use these
-        elif t_kind in (TokenKind.LITERAL,
-                        TokenKind.PUNCTUATION,
-                        TokenKind.IDENTIFIER):
-            # use but ignore
-            pass
-        
-        else:
-            print("Unknown!", t_kind, t_spelling)
-        
-        # if its OK we will add
-        if ok:
-            t_new.append(t)
-    return t_new
-
-
-def parm_size(node_child):
-    tokens = function_parm_wash_tokens(node_child)
-    
-    # print(" ".join([t.spelling for t in tokens]))
-    
-    # NOT PERFECT CODE, EXTRACT SIZE FROM TOKENS
-    if len(tokens) >= 3:  # foo [ 1 ]
-        if      ((tokens[-3].kind == TokenKind.PUNCTUATION and tokens[-3].spelling == "[") and
-                 (tokens[-2].kind == TokenKind.LITERAL and tokens[-2].spelling.isdigit()) and
-                 (tokens[-1].kind == TokenKind.PUNCTUATION and tokens[-1].spelling == "]")):
-            # ---
-            return int(tokens[-2].spelling)
-    return -1
-
-
-def function_get_arg_sizes(node):
-    # Return a dict if (index: size) items
-    # {arg_indx: arg_array_size, ... ]
-    arg_sizes = {}
-
-    if 1:  # node.spelling == "BM_vert_create", for debugging
-        node_parms = [node_child for node_child in node.get_children()
-                      if node_child.kind == CursorKind.PARM_DECL]
-
-        for i, node_child in enumerate(node_parms):
-
-            # print(node_child.kind, node_child.spelling)
-            #print(node_child.type.kind, node_child.spelling)  # TypeKind.POINTER
-            
-            if node_child.type.kind == TypeKind.POINTER:
-                pointee = node_child.type.get_pointee()
-                if pointee.is_pod():
-                    size = parm_size(node_child)
-                    if size != -1:
-                        arg_sizes[i] = size
-
-    return arg_sizes
-
-
-# -----------------------------------------------------------------------------
-_defs = {}
-
-
-def lookup_function_size_def(func_id):
-    if USE_LAZY_INIT:
-        result = _defs.get(func_id, {})
-        if type(result) != dict:
-            result = _defs[func_id] = function_get_arg_sizes(result)
-        return result
-    else:
-        return _defs.get(func_id, {})
-
-# -----------------------------------------------------------------------------
-
-
-def file_check_arg_sizes(tu):
-    
-    # main checking function
-    def validate_arg_size(node):
-        """
-        Loop over args and validate sizes for args we KNOW the size of.
-        """
-        assert node.kind == CursorKind.CALL_EXPR
-        
-        if 0:
-            print("---",
-                  " <~> ".join(
-                  [" ".join([t.spelling for t in C.get_tokens()])
-                  for C in node.get_children()]
-                  ))
-        # print(node.location)
-        
-        # first child is the function call, skip that.
-        children = list(node.get_children())
-
-        if not children:
-            return  # XXX, look into this, happens on C++
-        
-        func = children[0]
-        
-        # get the func declaration!
-        # works but we can better scan for functions ahead of time.
-        if 0:
-            func_dec = func.get_definition()
-            if func_dec:
-                print("FD", " ".join([t.spelling for t in func_dec.get_tokens()]))
-            else:
-                # HRMP'f - why does this fail?
-                print("AA", " ".join([t.spelling for t in node.get_tokens()]))
-        else:
-            args_size_definition = ()  # dummy
-            
-            # get the key
-            tok = list(func.get_tokens())
-            if tok:
-                func_id = tok[0].spelling
-                args_size_definition = lookup_function_size_def(func_id)
-        
-        if not args_size_definition:
-            return
-
-        children = children[1:]
-        for i, node_child in enumerate(children):
-            children = list(node_child.get_children())
-            
-            # skip if we dont have an index...
-            size_def = args_size_definition.get(i, -1)
-
-            if size_def == -1:
-                continue
-            
-            #print([c.kind for c in children])
-            # print(" ".join([t.spelling for t in node_child.get_tokens()]))
-            
-            if len(children) == 1:
-                arg = children[0]
-                if arg.kind in (CursorKind.DECL_REF_EXPR,
-                                CursorKind.UNEXPOSED_EXPR):
-
-                    if arg.type.kind == TypeKind.POINTER:
-                        dec = arg.get_definition()
-                        if dec:
-                            size = parm_size(dec)
-                            
-                            # size == 0 is for 'float *a'
-                            if size != -1 and size != 0:
-                                
-                                # nice print!
-                                if 0:
-                                    print("".join([t.spelling for t in func.get_tokens()]),
-                                          i,
-                                          " ".join([t.spelling for t in dec.get_tokens()]))
-
-                                # testing
-                                # size_def = 100
-                                if size < size_def and size != 1:
-                                    location = node.location
-                                    print("%s:%d:%d: argument %d is size %d, should be %d" %
-                                          (location.file,
-                                           location.line,
-                                           location.column,
-                                           i + 1, size, size_def
-                                           ))
-
-    # we dont really care what we are looking at, just scan entire file for
-    # function calls.
-
-    def recursive_func_call_check(node):
-        if node.kind == CursorKind.CALL_EXPR:
-            validate_arg_size(node)
-
-        for c in node.get_children():
-            recursive_func_call_check(c)
-
-    recursive_func_call_check(tu.cursor)
-
-
-# -- first pass, cache function definitions sizes
-
-# PRINT FUNC DEFINES
-def recursive_arg_sizes(node, ):
-    # print(node.kind, node.spelling)
-    if node.kind == CursorKind.FUNCTION_DECL:
-        if USE_LAZY_INIT:
-            args_sizes = node
-        else:
-            args_sizes = function_get_arg_sizes(node)
-        #if args_sizes:
-        #    print(node.spelling, args_sizes)
-        _defs[node.spelling] = args_sizes
-        # print("adding", node.spelling)
-    for c in node.get_children():
-        recursive_arg_sizes(c)
-# cache function sizes
-recursive_arg_sizes(tu.cursor)
-_defs.update(defs_precalc)
-
-# --- second pass, check against def's
-file_check_arg_sizes(tu)
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -1,311 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-import sys
-if not sys.version.startswith("3"):
-    print("\nPython3.x needed, found %s.\nAborting!\n" %
-          sys.version.partition(" ")[0])
-    sys.exit(1)
-
-from cmake_consistency_check_config import IGNORE, UTF8_CHECK, SOURCE_DIR
-
-import os
-from os.path import join, dirname, normpath, splitext
-
-print("Scanning:", SOURCE_DIR)
-
-global_h = set()
-global_c = set()
-global_refs = {}
-
-
-def replace_line(f, i, text, keep_indent=True):
-    file_handle = open(f, 'r')
-    data = file_handle.readlines()
-    file_handle.close()
-
-    l = data[i]
-    ws = l[:len(l) - len(l.lstrip())]
-
-    data[i] = "%s%s\n" % (ws, text)
-
-    file_handle = open(f, 'w')
-    file_handle.writelines(data)
-    file_handle.close()
-
-
-def source_list(path, filename_check=None):
-    for dirpath, dirnames, filenames in os.walk(path):
-
-        # skip '.svn'
-        if dirpath.startswith("."):
-            continue
-
-        for filename in filenames:
-            if filename_check is None or filename_check(filename):
-                yield os.path.join(dirpath, filename)
-
-
-# extension checking
-def is_cmake(filename):
-    ext = splitext(filename)[1]
-    return (ext == ".cmake") or (filename == "CMakeLists.txt")
-
-
-def is_c_header(filename):
-    ext = splitext(filename)[1]
-    return (ext in (".h", ".hpp", ".hxx"))
-
-
-def is_c(filename):
-    ext = splitext(filename)[1]
-    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
-
-
-def is_c_any(filename):
-    return is_c(filename) or is_c_header(filename)
-
-
-def cmake_get_src(f):
-
-    sources_h = []
-    sources_c = []
-
-    filen = open(f, "r", encoding="utf8")
-    it = iter(filen)
-    found = False
-    i = 0
-    # print(f)
-
-    def is_definition(l, f, i, name):
-        if l.startswith("unset("):
-            return False
-
-        if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)):
-            if len(l.split()) > 1:
-                raise Exception("strict formatting not kept 'set(%s*' %s:%d" % (name, f, i))
-            return True
-
-        if ("list(APPEND %s" % name) in l or ('list(APPEND ' in l and l.endswith(name)):
-            if l.endswith(")"):
-                raise Exception("strict formatting not kept 'list(APPEND %s...)' on 1 line %s:%d" % (name, f, i))
-            return True
-
-    while it is not None:
-        context_name = ""
-        while it is not None:
-            i += 1
-            try:
-                l = next(it)
-            except StopIteration:
-                it = None
-                break
-            l = l.strip()
-            if not l.startswith("#"):
-                found = is_definition(l, f, i, "SRC")
-                if found:
-                    context_name = "SRC"
-                    break
-                found = is_definition(l, f, i, "INC")
-                if found:
-                    context_name = "INC"
-                    break
-
-        if found:
-            cmake_base = dirname(f)
-
-            while it is not None:
-                i += 1
-                try:
-                    l = next(it)
-                except StopIteration:
-                    it = None
-                    break
-
-                l = l.strip()
-
-                if not l.startswith("#"):
-
-                    if ")" in l:
-                        if l.strip() != ")":
-                            raise Exception("strict formatting not kept '*)' %s:%d" % (f, i))
-                        break
-
-                    # replace dirs
-                    l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
-
-                    if not l:
-                        pass
-                    elif l.startswith("$"):
-                        if context_name == "SRC":
-                            # assume if it ends with context_name we know about it
-                            if not l.split("}")[0].endswith(context_name):
-                                print("Can't use var '%s' %s:%d" % (l, f, i))
-                    elif len(l.split()) > 1:
-                        raise Exception("Multi-line define '%s' %s:%d" % (l, f, i))
-                    else:
-                        new_file = normpath(join(cmake_base, l))
-
-                        if context_name == "SRC":
-                            if is_c_header(new_file):
-                                sources_h.append(new_file)
-                                global_refs.setdefault(new_file, []).append((f, i))
-                            elif is_c(new_file):
-                                sources_c.append(new_file)
-                                global_refs.setdefault(new_file, []).append((f, i))
-                            elif l in ("PARENT_SCOPE", ):
-                                # cmake var, ignore
-                                pass
-                            elif new_file.endswith(".list"):
-                                pass
-                            elif new_file.endswith(".def"):
-                                pass
-                            elif new_file.endswith(".cl"):  # opencl
-                                pass
-                            elif new_file.endswith(".cu"):  # cuda
-                                pass
-                            elif new_file.endswith(".osl"):  # open shading language
-                                pass
-                            else:
-                                raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
-
-                        elif context_name == "INC":
-                            if os.path.isdir(new_file):
-                                new_path_rel = os.path.relpath(new_file, cmake_base)
-
-                                if new_path_rel != l:
-                                    print("overly relative path:\n  %s:%d\n  %s\n  %s" % (f, i, l, new_path_rel))
-
-                                    ## Save time. just replace the line
-                                    # replace_line(f, i - 1, new_path_rel)
-
-                            else:
-                                raise Exception("non existant include %s:%d -> %s" % (f, i, new_file))
-
-                        # print(new_file)
-
-            global_h.update(set(sources_h))
-            global_c.update(set(sources_c))
-            '''
-            if not sources_h and not sources_c:
-                raise Exception("No sources %s" % f)
-
-            sources_h_fs = list(source_list(cmake_base, is_c_header))
-            sources_c_fs = list(source_list(cmake_base, is_c))
-            '''
-            # find missing C files:
-            '''
-            for ff in sources_c_fs:
-                if ff not in sources_c:
-                    print("  missing: " + ff)
-            '''
-
-            # reset
-            sources_h[:] = []
-            sources_c[:] = []
-
-    filen.close()
-
-
-for cmake in source_list(SOURCE_DIR, is_cmake):
-    cmake_get_src(cmake)
-
-
-def is_ignore(f):
-    for ig in IGNORE:
-        if ig in f:
-            return True
-    return False
-
-
-# First do stupid check, do these files exist?
-print("\nChecking for missing references:")
-is_err = False
-errs = []
-for f in (global_h | global_c):
-    if f.endswith("dna.c"):
-        continue
-
-    if not os.path.exists(f):
-        refs = global_refs[f]
-        if refs:
-            for cf, i in refs:
-                errs.append((cf, i))
-        else:
-            raise Exception("CMake referenecs missing, internal error, aborting!")
-        is_err = True
-
-errs.sort()
-errs.reverse()
-for cf, i in errs:
-    print("%s:%d" % (cf, i))
-    # Write a 'sed' script, useful if we get a lot of these
-    # print("sed '%dd' '%s' > '%s.tmp' ; mv '%s.tmp' '%s'" % (i, cf, cf, cf, cf))
-
-
-if is_err:
-    raise Exception("CMake referenecs missing files, aborting!")
-del is_err
-del errs
-
-# now check on files not accounted for.
-print("\nC/C++ Files CMake doesnt know about...")
-for cf in sorted(source_list(SOURCE_DIR, is_c)):
-    if not is_ignore(cf):
-        if cf not in global_c:
-            print("missing_c: ", cf)
-
-        # check if automake builds a corrasponding .o file.
-        '''
-        if cf in global_c:
-            out1 = os.path.splitext(cf)[0] + ".o"
-            out2 = os.path.splitext(cf)[0] + ".Po"
-            out2_dir, out2_file = out2 = os.path.split(out2)
-            out2 = os.path.join(out2_dir, ".deps", out2_file)
-            if not os.path.exists(out1) and not os.path.exists(out2):
-                print("bad_c: ", cf)
-        '''
-
-print("\nC/C++ Headers CMake doesnt know about...")
-for hf in sorted(source_list(SOURCE_DIR, is_c_header)):
-    if not is_ignore(hf):
-        if hf not in global_h:
-            print("missing_h: ", hf)
-
-if UTF8_CHECK:
-    # test encoding
-    import traceback
-    for files in (global_c, global_h):
-        for f in sorted(files):
-            if os.path.exists(f):
-                # ignore outside of our source tree
-                if "extern" not in f:
-                    i = 1
-                    try:
-                        for l in open(f, "r", encoding="utf8"):
-                            i += 1
-                    except:
-                        print("Non utf8: %s:%d" % (f, i))
-                        if i > 1:
-                            traceback.print_exc()
--- a/build_files/cmake/cmake_consistency_check_config.py
+++ b/build_files/cmake/cmake_consistency_check_config.py
@@ -1,56 +0,0 @@
-import os
-
-IGNORE = (
-    "/test/",
-    "/decimate_glut_test/",
-    "/BSP_GhostTest/",
-    "/release/",
-    "/xembed/",
-    "/decimation/intern/future/",
-    "/TerraplayNetwork/",
-    "/ik_glut_test/",
-
-    # specific source files
-    "extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp",
-    "extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp",
-    "extern/Eigen2/Eigen/src/QR/QrInstantiations.cpp",
-    "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
-    "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",
-    "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp",
-    "extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.cpp",
-    "extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp",
-    "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp",
-    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp",
-    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp",
-    "extern/eltopo/common/meshes/ObjLoader.cpp",
-    "extern/eltopo/common/meshes/meshloader.cpp",
-    "extern/eltopo/common/openglutils.cpp",
-    "extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp",
-    "source/blender/imbuf/intern/imbuf_cocoa.m",
-    "extern/recastnavigation/Recast/Source/RecastLog.cpp",
-    "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
-    "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
-    "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
-
-    "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
-    "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
-    "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h",
-    "extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h",
-    "extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h",
-    "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
-    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
-    "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
-    "extern/eltopo/common/meshes/Edge.hpp",
-    "extern/eltopo/common/meshes/ObjLoader.hpp",
-    "extern/eltopo/common/meshes/TriangleIndex.hpp",
-    "extern/eltopo/common/meshes/meshloader.h",
-    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
-    "extern/recastnavigation/Recast/Include/RecastLog.h",
-    "extern/recastnavigation/Recast/Include/RecastTimer.h",
-    "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
-    "intern/audaspace/SRC/AUD_SRCResampleReader.h",
-    )
-
-UTF8_CHECK = True
-
-SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", ".."))))
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -1,244 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton, M.G. Kishalmi
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-"""
-Example linux usage
- python3 ~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
-
-Windows not supported so far
-"""
-
-from project_info import (SIMPLE_PROJECTFILE,
-                          SOURCE_DIR,
-                          CMAKE_DIR,
-                          PROJECT_DIR,
-                          source_list,
-                          is_project_file,
-                          is_c_header,
-                          # is_py,
-                          cmake_advanced_info,
-                          cmake_compiler_defines,
-                          project_name_get,
-                          )
-
-
-import os
-from os.path import join, dirname, normpath, relpath, exists
-
-
-def create_nb_project_main():
-    files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
-    files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
-    files_rel.sort()
-
-    if SIMPLE_PROJECTFILE:
-        pass
-    else:
-        includes, defines = cmake_advanced_info()
-        # for some reason it doesnt give all internal includes
-        includes = list(set(includes) | set(dirname(f) for f in files if is_c_header(f)))
-        includes.sort()
-
-        if 0:
-            PROJECT_NAME = "Blender"
-        else:
-            # be tricky, get the project name from SVN if we can!
-            PROJECT_NAME = project_name_get(SOURCE_DIR)
-
-        # --------------- NB spesific
-        defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
-        defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
-
-        def file_list_to_nested(files):
-            # convert paths to hierarchy
-            paths_nested = {}
-
-            def ensure_path(filepath):
-                filepath_split = filepath.split(os.sep)
-
-                pn = paths_nested
-                for subdir in filepath_split[:-1]:
-                    pn = pn.setdefault(subdir, {})
-                pn[filepath_split[-1]] = None
-
-            for path in files:
-                ensure_path(path)
-            return paths_nested
-
-        PROJECT_DIR_NB = join(PROJECT_DIR, "nbproject")
-        if not exists(PROJECT_DIR_NB):
-            os.mkdir(PROJECT_DIR_NB)
-
-        # SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
-
-        f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
-
-        f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-        f.write('<project xmlns="http://www.netbeans.org/ns/project/1">\n')
-        f.write('    <type>org.netbeans.modules.cnd.makeproject</type>\n')
-        f.write('    <configuration>\n')
-        f.write('        <data xmlns="http://www.netbeans.org/ns/make-project/1">\n')
-        f.write('            <name>%s</name>\n' % PROJECT_NAME)
-        f.write('            <c-extensions>c,m</c-extensions>\n')
-        f.write('            <cpp-extensions>cpp,mm</cpp-extensions>\n')
-        f.write('            <header-extensions>h,hpp,inl</header-extensions>\n')
-        f.write('            <sourceEncoding>UTF-8</sourceEncoding>\n')
-        f.write('            <make-dep-projects/>\n')
-        f.write('            <sourceRootList>\n')
-        f.write('                <sourceRootElem>%s</sourceRootElem>\n' % SOURCE_DIR)  # base_root_rel
-        f.write('            </sourceRootList>\n')
-        f.write('            <confList>\n')
-        f.write('                <confElem>\n')
-        f.write('                    <name>Default</name>\n')
-        f.write('                    <type>0</type>\n')
-        f.write('                </confElem>\n')
-        f.write('            </confList>\n')
-        f.write('        </data>\n')
-        f.write('    </configuration>\n')
-        f.write('</project>\n')
-
-        f = open(join(PROJECT_DIR_NB, "configurations.xml"), 'w')
-
-        f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-        f.write('<configurationDescriptor version="79">\n')
-        f.write('  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">\n')
-        f.write('    <df name="blender" root="%s">\n' % SOURCE_DIR)  # base_root_rel
-
-        # write files!
-        files_rel_local = [normpath(relpath(join(CMAKE_DIR, path), SOURCE_DIR)) for path in files_rel]
-        files_rel_hierarchy = file_list_to_nested(files_rel_local)
-        # print(files_rel_hierarchy)
-
-        def write_df(hdir, ident):
-            dirs = []
-            files = []
-            for key, item in sorted(hdir.items()):
-                if item is None:
-                    files.append(key)
-                else:
-                    dirs.append((key, item))
-
-            for key, item in dirs:
-                f.write('%s  <df name="%s">\n' % (ident, key))
-                write_df(item, ident + "  ")
-                f.write('%s  </df>\n' % ident)
-
-            for key in files:
-                f.write('%s<in>%s</in>\n' % (ident, key))
-
-        write_df(files_rel_hierarchy, ident="    ")
-
-        f.write('    </df>\n')
-
-        f.write('    <logicalFolder name="ExternalFiles"\n')
-        f.write('                   displayName="Important Files"\n')
-        f.write('                   projectFiles="false"\n')
-        f.write('                   kind="IMPORTANT_FILES_FOLDER">\n')
-        # f.write('      <itemPath>../GNUmakefile</itemPath>\n')
-        f.write('    </logicalFolder>\n')
-
-        f.write('  </logicalFolder>\n')
-        # default, but this dir is infact not in blender dir so we can ignore it
-        # f.write('  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
-        f.write('  <sourceFolderFilter>^(nbproject|__pycache__|.*\.py|.*\.html|.*\.blend)$</sourceFolderFilter>\n')
-
-        f.write('  <sourceRootList>\n')
-        f.write('    <Elem>%s</Elem>\n' % SOURCE_DIR)  # base_root_rel
-        f.write('  </sourceRootList>\n')
-
-        f.write('  <projectmakefile>Makefile</projectmakefile>\n')
-
-        # paths again
-        f.write('  <confs>\n')
-        f.write('    <conf name="Default" type="0">\n')
-
-        f.write('      <toolsSet>\n')
-        f.write('        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>\n')
-        f.write('        <compilerSet>default</compilerSet>\n')
-        f.write('      </toolsSet>\n')
-        f.write('      <makefileType>\n')
-
-        f.write('        <makeTool>\n')
-        f.write('          <buildCommandWorkingDir>.</buildCommandWorkingDir>\n')
-        f.write('          <buildCommand>${MAKE} -f Makefile</buildCommand>\n')
-        f.write('          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>\n')
-        f.write('          <executablePath>./bin/blender</executablePath>\n')
-
-        def write_toolinfo():
-            f.write('            <incDir>\n')
-            for inc in includes:
-                f.write('              <pElem>%s</pElem>\n' % inc)
-            f.write('            </incDir>\n')
-            f.write('            <preprocessorList>\n')
-            for cdef in defines:
-                f.write('              <Elem>%s</Elem>\n' % cdef)
-            f.write('            </preprocessorList>\n')
-
-        f.write('          <cTool>\n')
-        write_toolinfo()
-        f.write('          </cTool>\n')
-
-        f.write('          <ccTool>\n')
-        write_toolinfo()
-        f.write('          </ccTool>\n')
-
-        f.write('        </makeTool>\n')
-        f.write('      </makefileType>\n')
-        # finishe makefle info
-
-        f.write('    \n')
-
-        for path in files_rel_local:
-            f.write('      <item path="%s"\n' % path)
-            f.write('            ex="false"\n')
-            f.write('            tool="1"\n')
-            f.write('            flavor="0">\n')
-            f.write('      </item>\n')
-
-        f.write('      <runprofile version="9">\n')
-        f.write('        <runcommandpicklist>\n')
-        f.write('        </runcommandpicklist>\n')
-        f.write('        <runcommand>%s</runcommand>\n' % os.path.join(CMAKE_DIR, "bin/blender"))
-        f.write('        <rundir>%s</rundir>\n' % SOURCE_DIR)
-        f.write('        <buildfirst>false</buildfirst>\n')
-        f.write('        <terminal-type>0</terminal-type>\n')
-        f.write('        <remove-instrumentation>0</remove-instrumentation>\n')
-        f.write('        <environment>\n')
-        f.write('        </environment>\n')
-        f.write('      </runprofile>\n')
-
-        f.write('    </conf>\n')
-        f.write('  </confs>\n')
-
-        # todo
-
-        f.write('</configurationDescriptor>\n')
-
-
-def main():
-    create_nb_project_main()
-
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
@@ -1,158 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton, M.G. Kishalmi
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-"""
-Example Win32 usage:
- c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
-
-example linux usage
- python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
-"""
-
-from project_info import (SIMPLE_PROJECTFILE,
-                          SOURCE_DIR,
-                          # CMAKE_DIR,
-                          PROJECT_DIR,
-                          source_list,
-                          is_project_file,
-                          is_c_header,
-                          is_py,
-                          cmake_advanced_info,
-                          cmake_compiler_defines,
-                          project_name_get,
-                          )
-
-import os
-import sys
-
-
-def quote_define(define):
-    if " " in define.strip():
-        return '"%s"' % define
-    else:
-        return define
-
-
-def create_qtc_project_main():
-    files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
-    files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
-    files_rel.sort()
-
-    # --- qtcreator specific, simple format
-    if SIMPLE_PROJECTFILE:
-        # --- qtcreator specific, simple format
-        PROJECT_NAME = "Blender"
-        f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
-        f.write("\n".join(files_rel))
-
-        f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
-        f.write("\n".join(sorted(list(set(os.path.dirname(f)
-                          for f in files_rel if is_c_header(f))))))
-
-        qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
-        f = open(qtc_prj, 'w')
-        f.write("[General]\n")
-
-        qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
-        if not os.path.exists(qtc_cfg):
-            f = open(qtc_cfg, 'w')
-            f.write("// ADD PREDEFINED MACROS HERE!\n")
-    else:
-        includes, defines = cmake_advanced_info()
-
-        # for some reason it doesnt give all internal includes
-        includes = list(set(includes) | set(os.path.dirname(f)
-                        for f in files_rel if is_c_header(f)))
-        includes.sort()
-
-        if 0:
-            PROJECT_NAME = "Blender"
-        else:
-            # be tricky, get the project name from SVN if we can!
-            PROJECT_NAME = project_name_get(SOURCE_DIR)
-
-        FILE_NAME = PROJECT_NAME.lower()
-        f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
-        f.write("\n".join(files_rel))
-
-        f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w', encoding='utf-8')
-        f.write("\n".join(sorted(includes)))
-
-        qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
-        f = open(qtc_prj, 'w')
-        f.write("[General]\n")
-
-        qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
-        f = open(qtc_cfg, 'w')
-        f.write("// ADD PREDEFINED MACROS TO %s_custom.config!\n" % FILE_NAME)
-        qtc_custom_cfg = os.path.join(PROJECT_DIR, "%s_custom.config" % FILE_NAME)
-        if os.path.exists(qtc_custom_cfg):
-            fc = open(qtc_custom_cfg, 'r')
-            f.write(fc.read())
-            fc.close()
-            f.write("\n")
-        defines_final = [("#define %s %s" % (item[0], quote_define(item[1]))) for item in defines]
-        if sys.platform != "win32":
-            defines_final += cmake_compiler_defines()
-        f.write("\n".join(defines_final))
-
-    print("Blender project file written to: %r" % qtc_prj)
-    # --- end
-
-
-def create_qtc_project_python():
-    files = list(source_list(SOURCE_DIR, filename_check=is_py))
-    files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
-    files_rel.sort()
-
-    # --- qtcreator specific, simple format
-    if 0:
-        PROJECT_NAME = "Blender_Python"
-    else:
-        # be tricky, get the project name from SVN if we can!
-        PROJECT_NAME = project_name_get(SOURCE_DIR) + "_Python"
-
-    FILE_NAME = PROJECT_NAME.lower()
-    f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
-    f.write("\n".join(files_rel))
-
-    qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
-    f = open(qtc_prj, 'w')
-    f.write("[General]\n")
-
-    qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
-    if not os.path.exists(qtc_cfg):
-        f = open(qtc_cfg, 'w')
-        f.write("// ADD PREDEFINED MACROS HERE!\n")
-
-    print("Python project file written to:  %r" % qtc_prj)
-
-
-def main():
-    create_qtc_project_main()
-    create_qtc_project_python()
-
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/cmake_static_check_clang_array.py
+++ b/build_files/cmake/cmake_static_check_clang_array.py
@@ -1,77 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-import project_source_info
-import subprocess
-import sys
-import os
-
-CHECKER_IGNORE_PREFIX = [
-    "extern",
-    "intern/moto",
-    "blender/intern/opennl",
-    ]
-
-CHECKER_BIN = "python2"
-
-CHECKER_ARGS = [
-    os.path.join(os.path.dirname(__file__), "clang_array_check.py"),
-    # not sure why this is needed, but it is.
-    "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
-    ]
-
-
-def main():
-    source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-
-    check_commands = []
-    for c, inc_dirs, defs in source_info:
-        cmd = ([CHECKER_BIN] +
-                CHECKER_ARGS +
-               [c] +
-               [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
-               )
-
-        check_commands.append((c, cmd))
-
-    process_functions = []
-
-    def my_process(i, c, cmd):
-        percent = 100.0 * (i / (len(check_commands) - 1))
-        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
-        sys.stdout.flush()
-        sys.stdout.write("%s " % percent_str)
-
-        return subprocess.Popen(cmd)
-
-    for i, (c, cmd) in enumerate(check_commands):
-        process_functions.append((my_process, (i, c, cmd)))
-
-    project_source_info.queue_processes(process_functions)
-
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/cmake_static_check_cppcheck.py
+++ b/build_files/cmake/cmake_static_check_cppcheck.py
@@ -1,80 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-import project_source_info
-import subprocess
-import sys
-import os
-
-CHECKER_IGNORE_PREFIX = [
-    "extern",
-    "intern/moto",
-    "blender/intern/opennl",
-    ]
-
-CHECKER_BIN = "cppcheck"
-
-CHECKER_ARGS = [
-    # not sure why this is needed, but it is.
-    "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
-    "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
-    # "--max-configs=1",  # speeds up execution
-    #  "--check-config", # when includes are missing
-    #  "--enable=all",  # if you want sixty hundred pedantic suggestions
-    ]
-
-
-def main():
-    source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-
-    check_commands = []
-    for c, inc_dirs, defs in source_info:
-        cmd = ([CHECKER_BIN] +
-                CHECKER_ARGS +
-               [c] +
-               [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
-               )
-
-        check_commands.append((c, cmd))
-
-    process_functions = []
-
-    def my_process(i, c, cmd):
-        percent = 100.0 * (i / (len(check_commands) - 1))
-        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
-        sys.stdout.flush()
-        sys.stdout.write("%s " % percent_str)
-
-        return subprocess.Popen(cmd)
-
-    for i, (c, cmd) in enumerate(check_commands):
-        process_functions.append((my_process, (i, c, cmd)))
-
-    project_source_info.queue_processes(process_functions)
-
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/cmake_static_check_smatch.py
+++ b/build_files/cmake/cmake_static_check_smatch.py
@@ -1,74 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-CHECKER_IGNORE_PREFIX = [
-    "extern",
-    "intern/moto",
-    "blender/intern/opennl",
-    ]
-
-CHECKER_BIN = "smatch"
-CHECKER_ARGS = [
-    "--full-path",
-    "--two-passes",
-    ]
-
-import project_source_info
-import subprocess
-import sys
-
-
-def main():
-    source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-
-    check_commands = []
-    for c, inc_dirs, defs in source_info:
-
-        cmd = ([CHECKER_BIN] +
-                CHECKER_ARGS +
-               [c] +
-               [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
-               )
-
-        check_commands.append((c, cmd))
-
-    def my_process(i, c, cmd):
-        percent = 100.0 * (i / (len(check_commands) - 1))
-        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
-        sys.stdout.flush()
-        sys.stdout.write("%s %s\n" % (percent_str, c))
-
-        return subprocess.Popen(cmd)
-
-    process_functions = []
-    for i, (c, cmd) in enumerate(check_commands):
-        process_functions.append((my_process, (i, c, cmd)))
-
-    project_source_info.queue_processes(process_functions)
-
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/cmake_static_check_sparse.py
+++ b/build_files/cmake/cmake_static_check_sparse.py
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-CHECKER_IGNORE_PREFIX = [
-    "extern",
-    "intern/moto",
-    "blender/intern/opennl",
-    ]
-
-CHECKER_BIN = "sparse"
-CHECKER_ARGS = [
-    ]
-
-import project_source_info
-import subprocess
-import sys
-
-
-def main():
-    source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-
-    check_commands = []
-    for c, inc_dirs, defs in source_info:
-
-        cmd = ([CHECKER_BIN] +
-                CHECKER_ARGS +
-               [c] +
-               [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
-               )
-
-        check_commands.append((c, cmd))
-
-    def my_process(i, c, cmd):
-        percent = 100.0 * (i / (len(check_commands) - 1))
-        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
-        sys.stdout.flush()
-        sys.stdout.write("%s %s\n" % (percent_str, c))
-
-        return subprocess.Popen(cmd)
-
-    process_functions = []
-    for i, (c, cmd) in enumerate(check_commands):
-        process_functions.append((my_process, (i, c, cmd)))
-
-    project_source_info.queue_processes(process_functions)
-
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/cmake_static_check_splint.py
+++ b/build_files/cmake/cmake_static_check_splint.py
@@ -1,104 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-CHECKER_IGNORE_PREFIX = [
-    "extern",
-    "intern/moto",
-    "blender/intern/opennl",
-    ]
-
-CHECKER_BIN = "splint"
-
-CHECKER_ARGS = [
-    "-weak",
-    "-posix-lib",
-    "-linelen", "10000",
-    "+ignorequals",
-    "+relaxtypes",
-    "-retvalother",
-    "+matchanyintegral",
-    "+longintegral",
-    "+ignoresigns",
-    "-nestcomment",
-    "-predboolothers",
-    "-ifempty",
-    "-unrecogcomments",
-
-    # we may want to remove these later
-    "-type",
-    "-fixedformalarray",
-    "-fullinitblock",
-    "-fcnuse",
-    "-initallelements",
-    "-castfcnptr",
-    # -forcehints,
-    "-bufferoverflowhigh",  # warns a lot about sprintf()
-
-    # re-definitions, rna causes most of these
-    "-redef",
-    "-syntax",
-
-    # dummy, witjout this splint complains with:
-    #  /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
-    "-D_PC_MAX_CANON=0",
-    ]
-
-
-import project_source_info
-import subprocess
-import sys
-
-
-def main():
-    source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-
-    check_commands = []
-    for c, inc_dirs, defs in source_info:
-        cmd = ([CHECKER_BIN] +
-                CHECKER_ARGS +
-               [c] +
-               [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
-               )
-
-        check_commands.append((c, cmd))
-
-    def my_process(i, c, cmd):
-        percent = 100.0 * (i / (len(check_commands) - 1))
-        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
-        sys.stdout.write("%s %s\n" % (percent_str, c))
-        sys.stdout.flush()
-
-        return subprocess.Popen(cmd)
-
-    process_functions = []
-    for i, (c, cmd) in enumerate(check_commands):
-        process_functions.append((my_process, (i, c, cmd)))
-
-    project_source_info.queue_processes(process_functions)
-
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/config/blender_headless.cmake
+++ b/build_files/cmake/config/blender_headless.cmake
@@ -1,23 +0,0 @@
-# headless configuration, useful in for servers or renderfarms
-# builds without a windowing system (X11/Windows/Cocoa).
-#
-# Example usage:
-#   cmake -C../blender/build_files/cmake/config/blender_headless.cmake  ../blender
-#
-
-set(WITH_HEADLESS            ON  CACHE FORCE BOOL) 
-set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
-
-# disable audio, its possible some devs may want this but for now disable
-# so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_FFTW3               OFF CACHE FORCE BOOL)
-set(WITH_JACK                OFF CACHE FORCE BOOL)
-set(WITH_SDL                 OFF CACHE FORCE BOOL)
-set(WITH_OPENAL              OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
-
-# other features which are not especially useful as a python module
-set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -1,52 +0,0 @@
-# turn everything OFF except for python which defaults to ON
-# and is needed for the UI
-#
-# Example usage:
-#   cmake -C../blender/build_files/cmake/config/blender_lite.cmake  ../blender
-#
-
-set(WITH_INSTALL_PORTABLE    ON  CACHE FORCE BOOL)
-set(WITH_SYSTEM_GLEW         ON  CACHE FORCE BOOL)
-
-set(WITH_BUILDINFO           OFF CACHE FORCE BOOL)
-set(WITH_BULLET              OFF CACHE FORCE BOOL)
-set(WITH_CODEC_AVI           OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
-set(WITH_CYCLES              OFF CACHE FORCE BOOL)
-set(WITH_FFTW3               OFF CACHE FORCE BOOL)
-set(WITH_LIBMV               OFF CACHE FORCE BOOL)
-set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
-set(WITH_COMPOSITOR          OFF CACHE FORCE BOOL)
-set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
-set(WITH_IK_SOLVER           OFF CACHE FORCE BOOL)
-set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_DDS           OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_FRAMESERVER   OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_HDR           OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_OPENEXR       OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_OPENJPEG      OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_REDCODE       OFF CACHE FORCE BOOL)
-set(WITH_IMAGE_TIFF          OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
-set(WITH_INTERNATIONAL       OFF CACHE FORCE BOOL)
-set(WITH_JACK                OFF CACHE FORCE BOOL)
-set(WITH_LZMA                OFF CACHE FORCE BOOL)
-set(WITH_LZO                 OFF CACHE FORCE BOOL)
-set(WITH_MOD_BOOLEAN         OFF CACHE FORCE BOOL)
-set(WITH_MOD_DECIMATE        OFF CACHE FORCE BOOL)
-set(WITH_MOD_FLUID           OFF CACHE FORCE BOOL)
-set(WITH_MOD_REMESH          OFF CACHE FORCE BOOL)
-set(WITH_MOD_SMOKE           OFF CACHE FORCE BOOL)
-set(WITH_MOD_OCEANSIM        OFF CACHE FORCE BOOL)
-set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_OPENAL              OFF CACHE FORCE BOOL)
-set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)
-set(WITH_OPENCOLORIO         OFF CACHE FORCE BOOL)
-set(WITH_OPENMP              OFF CACHE FORCE BOOL)
-set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
-set(WITH_RAYOPTIMIZATION     OFF CACHE FORCE BOOL)
-set(WITH_SDL                 OFF CACHE FORCE BOOL)
-set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
-set(WITH_X11_XF86VMODE       OFF CACHE FORCE BOOL)
--- a/build_files/cmake/config/bpy_module.cmake
+++ b/build_files/cmake/config/bpy_module.cmake
@@ -1,33 +0,0 @@
-# defaults for building blender as a python module 'bpy'
-#
-# Example usage:
-#   cmake -C../blender/build_files/cmake/config/bpy_module.cmake  ../blender
-#
-
-set(WITH_PYTHON_MODULE       ON  CACHE FORCE BOOL)
-
-# install into the systems python dir
-set(WITH_INSTALL_PORTABLE    OFF CACHE FORCE BOOL)
-
-# no point int copying python into python
-set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
-
-# dont build the game engine
-set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
-
-# disable audio, its possible some devs may want this but for now disable
-# so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
-set(WITH_FFTW3               OFF CACHE FORCE BOOL)
-set(WITH_JACK                OFF CACHE FORCE BOOL)
-set(WITH_SDL                 OFF CACHE FORCE BOOL)
-set(WITH_OPENAL              OFF CACHE FORCE BOOL)
-set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
-set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
-
-# other features which are not especially useful as a python module
-set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
-set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
-set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)
-set(WITH_INTERNATIONAL       OFF CACHE FORCE BOOL)
-set(WITH_BULLET              OFF CACHE FORCE BOOL)
--- a/build_files/cmake/example_scripts/cmake_linux_install.sh
+++ b/build_files/cmake/example_scripts/cmake_linux_install.sh
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# This shell script checks out and compiles blender, tested on ubuntu 10.04
-# assumes you have dependancies installed alredy
-
-# See this page for more info:
-#  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
-
-# grab blender
-mkdir ~/blender-svn 
-cd ~/blender-svn
-svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
-
-# create cmake dir
-mkdir ~/blender-svn/build-cmake
-cd ~/blender-svn/build-cmake
-
-# cmake without copying files for fast rebuilds
-# the files from svn will be used in place
-cmake ../blender
-
-# make blender, will take some time
-make
-
-# link the binary to blenders source directory to run quickly
-ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
-
-# useful info
-echo ""
-echo "* Useful Commands *"
-echo "   Run Blender: ~/blender-svn/blender/blender.bin"
-echo "   Update Blender: svn up ~/blender-svn/blender"
-echo "   Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
-echo "   Build Blender: cd ~/blender-svn/build-cmake ; make"
-echo ""
-
-
--- a/build_files/cmake/example_scripts/make_quicky.py
+++ b/build_files/cmake/example_scripts/make_quicky.py
@@ -1,118 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ##### 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-
-def print_help(targets):
-    print("CMake quicky wrapper, no valid targets given.")
-    print(" * targets can contain a subset of the full target name.")
-    print(" * arguments with a '-' prefix are passed onto make.")
-    print(" * this must run from the cmake build dir")
-    print(" * alias this with a short command for speedy access, in bash:")
-    print("   alias mk='../blender/build_files/cmake/example_scripts/make_quicky.py'")
-    print("")
-    print(" eg: make_quicky.py -j3 extern python")
-    print(" ...will execute")
-    print(" make -j3 extern_binreloc extern_glew bf_python bf_python_ext blender/fast")
-    print("")
-    print("Target List:")
-    for t in targets:
-        print("    %s" % t)
-    print("...exiting")
-
-
-def main():
-    targets = set()
-
-    # collect targets
-    makefile = open("Makefile", "r")
-    for line in makefile:
-        line = line.rstrip()
-        if not line or line[0] in ". \t@$#":
-            continue
-
-        line = line.split("#", 1)[0]
-        if ":" not in line:
-            continue
-
-        line = line.split(":", 1)[0]
-
-        if "/" in line:  # cmake terget options, dont need these
-            continue
-
-        targets.add(line)
-    makefile.close()
-
-    # remove cmake targets
-    bad = set([
-        "help",
-        "clean",
-        "all",
-        "preinstall",
-        "install",
-        "default_target",
-        "edit_cache",
-        "cmake_force",
-        "rebuild_cache",
-        "depend",
-        "cmake_check_build_system",
-        ])
-
-    targets -= set(bad)
-
-    # parse args
-    targets = list(targets)
-    targets.sort()
-
-    import sys
-    if len(sys.argv) == 1:
-        print_help(targets)
-        return
-
-    targets_new = []
-    args = []
-    for arg in sys.argv[1:]:
-        if arg[0] in "/-":
-            args.append(arg)
-        else:
-            found = False
-            for t in targets:
-                if arg in t and t not in targets_new:
-                    targets_new.append(t)
-                    found = True
-
-            if not found:
-                print("Error '%s' not found in...")
-                for t in targets:
-                    print("    %s" % t)
-                print("...aborting.")
-                return
-
-    # execute
-    cmd = "make %s %s blender/fast" % (" ".join(args), " ".join(targets_new))
-    print("cmake building with targets: %s" % " ".join(targets_new))
-    print("executing: %s" % cmd)
-
-    import os
-    os.system(cmd)
-
-if __name__ == "__main__":
-    main()
--- a/build_files/cmake/example_scripts/make_quiet.sh
+++ b/build_files/cmake/example_scripts/make_quiet.sh
@@ -1,10 +0,0 @@
-#!/bin/bash
-# filters CMake output to be more like nan-makefiles
-
-FILTER="^\[ *[0-9]*%] \|^Built target \|^Scanning "
-make $@ | \
-		sed -u -e 's/^Linking .*\//Linking /' | \
-		sed -u -e 's/^.*\//  /' | \
-		grep --line-buffered -v "$FILTER"
-
-echo "Build Done"
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1,791 +0,0 @@
-# ***** 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): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-macro(list_insert_after
-	list_id item_check item_add
-	)
-	set(_index)
-	list(FIND "${list_id}" "${item_check}" _index)
-	if("${_index}" MATCHES "-1")
-		message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
-	endif()
-	math(EXPR _index "${_index} + 1")
-	list(INSERT ${list_id} "${_index}" ${item_add})
-	unset(_index)
-endmacro()
-
-macro(list_insert_before
-	list_id item_check item_add
-	)
-	set(_index)
-	list(FIND "${list_id}" "${item_check}" _index)
-	if("${_index}" MATCHES "-1")
-		message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
-	endif()
-	list(INSERT ${list_id} "${_index}" ${item_add})
-	unset(_index)
-endmacro()
-
-# foo_bar.spam --> foo_barMySuffix.spam
-macro(file_suffix
-	file_name_new file_name file_suffix
-	)
-
-	get_filename_component(_file_name_PATH ${file_name} PATH)
-	get_filename_component(_file_name_NAME_WE ${file_name} NAME_WE)
-	get_filename_component(_file_name_EXT ${file_name} EXT)
-	set(${file_name_new} "${_file_name_PATH}/${_file_name_NAME_WE}${file_suffix}${_file_name_EXT}")
-
-	unset(_file_name_PATH)
-	unset(_file_name_NAME_WE)
-	unset(_file_name_EXT)
-endmacro()
-
-# useful for adding debug suffix to library lists:
-# /somepath/foo.lib --> /somepath/foo_d.lib
-macro(file_list_suffix
-	fp_list_new fp_list fn_suffix
-	)
-
-	# incase of empty list
-	set(_fp)
-	set(_fp_suffixed)
-
-	set(fp_list_new)
-
-	foreach(_fp ${fp_list})
-		file_suffix(_fp_suffixed "${_fp}" "${fn_suffix}")
-		list(APPEND "${fp_list_new}" "${_fp_suffixed}")
-	endforeach()
-
-	unset(_fp)
-	unset(_fp_suffixed)
-
-endmacro()
-
-
-macro(target_link_libraries_optimized TARGET LIBS)
-	foreach(_LIB ${LIBS})
-		target_link_libraries(${TARGET} optimized "${_LIB}")
-	endforeach()
-	unset(_LIB)
-endmacro()
-
-macro(target_link_libraries_debug TARGET LIBS)
-	foreach(_LIB ${LIBS})
-		target_link_libraries(${TARGET} debug "${_LIB}")
-	endforeach()
-	unset(_LIB)
-endmacro()
-
-# Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
-# use it instead of include_directories()
-macro(blender_include_dirs
-	includes)
-	set(_ALL_INCS "")
-	foreach(_INC ${ARGV})
-		get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
-		list(APPEND _ALL_INCS ${_ABS_INC})
-		# for checking for invalid includes, disable for regular use
-		##if(NOT EXISTS "${_ABS_INC}/")
-		##	message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
-		##endif()
-	endforeach()
-	include_directories(${_ALL_INCS})
-	unset(_INC)
-	unset(_ABS_INC)
-	unset(_ALL_INCS)
-endmacro()
-
-macro(blender_include_dirs_sys
-	includes)
-	set(_ALL_INCS "")
-	foreach(_INC ${ARGV})
-		get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
-		list(APPEND _ALL_INCS ${_ABS_INC})
-		##if(NOT EXISTS "${_ABS_INC}/")
-		##	message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
-		##endif()
-	endforeach()
-	include_directories(SYSTEM ${_ALL_INCS})
-	unset(_INC)
-	unset(_ABS_INC)
-	unset(_ALL_INCS)
-endmacro()
-
-macro(blender_source_group
-	sources)
-
-	# Group by location on disk
-	source_group("Source Files" FILES CMakeLists.txt)
-
-	foreach(_SRC ${sources})
-		get_filename_component(_SRC_EXT ${_SRC} EXT)
-		if((${_SRC_EXT} MATCHES ".h") OR (${_SRC_EXT} MATCHES ".hpp"))
-			source_group("Header Files" FILES ${_SRC})
-		else()
-			source_group("Source Files" FILES ${_SRC})
-		endif()
-	endforeach()
-
-	unset(_SRC)
-	unset(_SRC_EXT)
-endmacro()
-
-
-# only MSVC uses SOURCE_GROUP
-macro(blender_add_lib_nolist
-	name
-	sources
-	includes
-	includes_sys)
-
-	# message(STATUS "Configuring library ${name}")
-
-	# include_directories(${includes})
-	# include_directories(SYSTEM ${includes_sys})
-	blender_include_dirs("${includes}")
-	blender_include_dirs_sys("${includes_sys}")
-
-	add_library(${name} ${sources})
-
-	# works fine without having the includes
-	# listed is helpful for IDE's (QtCreator/MSVC)
-	blender_source_group("${sources}")
-
-endmacro()
-
-
-macro(blender_add_lib
-	name
-	sources
-	includes
-	includes_sys)
-
-	blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
-
-	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
-endmacro()
-
-
-macro(SETUP_LIBDIRS)
-	link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
-
-	if(WITH_PYTHON)  #  AND NOT WITH_PYTHON_MODULE  # WIN32 needs
-		link_directories(${PYTHON_LIBPATH})
-	endif()
-	if(WITH_INTERNATIONAL)
-		link_directories(${ICONV_LIBPATH})
-		link_directories(${GETTEXT_LIBPATH})
-	endif()
-	if(WITH_SDL)
-		link_directories(${SDL_LIBPATH})
-	endif()
-	if(WITH_CODEC_FFMPEG)
-		link_directories(${FFMPEG_LIBPATH})
-	endif()
-	if(WITH_IMAGE_OPENEXR)
-		link_directories(${OPENEXR_LIBPATH})
-	endif()
-	if(WITH_IMAGE_TIFF)
-		link_directories(${TIFF_LIBPATH})
-	endif()
-	if(WITH_BOOST)
-		link_directories(${BOOST_LIBPATH})
-	endif()
-	if(WITH_OPENIMAGEIO)
-		link_directories(${OPENIMAGEIO_LIBPATH})
-	endif()
-	if(WITH_OPENCOLORIO)
-		link_directories(${OPENCOLORIO_LIBPATH})
-	endif()
-	if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
-		link_directories(${OPENJPEG_LIBPATH})
-	endif()
-	if(WITH_CODEC_QUICKTIME)
-		link_directories(${QUICKTIME_LIBPATH})
-	endif()
-	if(WITH_OPENAL)
-		link_directories(${OPENAL_LIBPATH})
-	endif()
-	if(WITH_JACK)
-		link_directories(${JACK_LIBPATH})
-	endif()
-	if(WITH_CODEC_SNDFILE)
-		link_directories(${SNDFILE_LIBPATH})
-	endif()
-	if(WITH_FFTW3)
-		link_directories(${FFTW3_LIBPATH})
-	endif()
-	if(WITH_OPENCOLLADA)
-		link_directories(${OPENCOLLADA_LIBPATH})
-		link_directories(${PCRE_LIBPATH})
-		link_directories(${EXPAT_LIBPATH})
-	endif()
-	if(WITH_LLVM)
-		link_directories(${LLVM_LIB_DIR})
-	endif()
-	if(WITH_MEM_JEMALLOC)
-		link_directories(${JEMALLOC_LIBPATH})
-	endif()
-
-	if(WIN32 AND NOT UNIX)
-		link_directories(${PTHREADS_LIBPATH})
-	endif()
-endmacro()
-
-macro(setup_liblinks
-	target)
-
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
-	set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")
-
-	target_link_libraries(${target}
-			${OPENGL_gl_LIBRARY}
-			${OPENGL_glu_LIBRARY}
-			${PNG_LIBRARIES}
-			${ZLIB_LIBRARIES}
-			${FREETYPE_LIBRARY})
-
-	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
-	if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
-		target_link_libraries(${target} ${PYTHON_LINKFLAGS})
-
-		if(WIN32 AND NOT UNIX)
-			file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
-			target_link_libraries_debug(${target} "${PYTHON_LIBRARIES_DEBUG}")
-			target_link_libraries_optimized(${target} "${PYTHON_LIBRARIES}")
-			unset(PYTHON_LIBRARIES_DEBUG)
-		else()
-			target_link_libraries(${target} ${PYTHON_LIBRARIES})
-		endif()
-	endif()
-
-	if(WITH_SYSTEM_GLEW)
-		target_link_libraries(${target} ${GLEW_LIBRARY})
-	endif()
-
-	if(WITH_INTERNATIONAL)
-		target_link_libraries(${target} ${GETTEXT_LIBRARIES})
-
-		if(WIN32 AND NOT UNIX)
-			target_link_libraries(${target} ${ICONV_LIBRARIES})
-		endif()
-	endif()
-
-	if(WITH_OPENAL)
-		target_link_libraries(${target} ${OPENAL_LIBRARY})
-	endif()
-	if(WITH_FFTW3)
-		target_link_libraries(${target} ${FFTW3_LIBRARIES})
-	endif()
-	if(WITH_JACK)
-		target_link_libraries(${target} ${JACK_LIBRARIES})
-	endif()
-	if(WITH_CODEC_SNDFILE)
-		target_link_libraries(${target} ${SNDFILE_LIBRARIES})
-	endif()
-	if(WITH_SDL)
-		target_link_libraries(${target} ${SDL_LIBRARY})
-	endif()
-	if(WITH_CODEC_QUICKTIME)
-		target_link_libraries(${target} ${QUICKTIME_LIBRARIES})
-	endif()
-	if(WITH_IMAGE_TIFF)
-		target_link_libraries(${target} ${TIFF_LIBRARY})
-	endif()
-	if(WITH_OPENIMAGEIO)
-		target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES})
-	endif()
-	if(WITH_OPENCOLORIO)
-		target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
-	endif()
-	if(WITH_BOOST)
-		target_link_libraries(${target} ${BOOST_LIBRARIES})
-	endif()
-	target_link_libraries(${target} ${JPEG_LIBRARIES})
-	if(WITH_IMAGE_OPENEXR)
-		if(WIN32 AND NOT UNIX AND NOT CMAKE_COMPILER_IS_GNUCC)
-			file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")
-			target_link_libraries_debug(${target} "${OPENEXR_LIBRARIES_DEBUG}")
-			target_link_libraries_optimized(${target} "${OPENEXR_LIBRARIES}")
-			unset(OPENEXR_LIBRARIES_DEBUG)
-		else()
-			target_link_libraries(${target} ${OPENEXR_LIBRARIES})
-		endif()
-	endif()
-	if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
-		target_link_libraries(${target} ${OPENJPEG_LIBRARIES})
-	endif()
-	if(WITH_CODEC_FFMPEG)
-
-		# Strange!, without this ffmpeg gives linking errors (on linux)
-		# even though its linked above
-		target_link_libraries(${target} ${OPENGL_glu_LIBRARY})
-
-		target_link_libraries(${target} ${FFMPEG_LIBRARIES})
-	endif()
-	if(WITH_OPENCOLLADA)
-		if(WIN32 AND NOT UNIX)
-			file_list_suffix(OPENCOLLADA_LIBRARIES_DEBUG "${OPENCOLLADA_LIBRARIES}" "_d")
-			target_link_libraries_debug(${target} "${OPENCOLLADA_LIBRARIES_DEBUG}")
-			target_link_libraries_optimized(${target} "${OPENCOLLADA_LIBRARIES}")
-			unset(OPENCOLLADA_LIBRARIES_DEBUG)
-
-			file_list_suffix(PCRE_LIBRARIES_DEBUG "${PCRE_LIBRARIES}" "_d")
-			target_link_libraries_debug(${target} "${PCRE_LIBRARIES_DEBUG}")
-			target_link_libraries_optimized(${target} "${PCRE_LIBRARIES}")
-			unset(PCRE_LIBRARIES_DEBUG)
-
-			if(EXPAT_LIB)
-				file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d")
-				target_link_libraries_debug(${target} "${EXPAT_LIB_DEBUG}")
-				target_link_libraries_optimized(${target} "${EXPAT_LIB}")
-				unset(EXPAT_LIB_DEBUG)
-			endif()
-		else()
-			target_link_libraries(${target}
-					${OPENCOLLADA_LIBRARIES}
-					${PCRE_LIBRARIES}
-					${XML2_LIBRARIES}
-					${EXPAT_LIB})
-		endif()
-	endif()
-	if(WITH_MEM_JEMALLOC)
-		target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
-	endif()
-	if(WITH_INPUT_NDOF)
-		target_link_libraries(${target} ${NDOF_LIBRARIES})
-	endif()
-	if(WITH_MOD_CLOTH_ELTOPO)
-		target_link_libraries(${target} ${LAPACK_LIBRARIES})
-	endif()
-	if(WITH_CYCLES_OSL)
-		target_link_libraries(${target} ${OSL_LIBRARIES})
-	endif()
-	if(WITH_LLVM)
-		target_link_libraries(${target} ${LLVM_LIBRARY})
-	endif()
-	if(WIN32 AND NOT UNIX)
-		target_link_libraries(${target} ${PTHREADS_LIBRARIES})
-	endif()
-
-	target_link_libraries(${target} ${PLATFORM_LINKLIBS})
-endmacro()
-
-macro(TEST_SSE_SUPPORT
-	_sse_flags
-	_sse2_flags)
-
-	include(CheckCSourceRuns)
-
-	# message(STATUS "Detecting SSE support")
-	if(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
-		set(${_sse_flags} "-msse")
-		set(${_sse2_flags} "-msse2")
-	elseif(MSVC)
-		set(${_sse_flags} "/arch:SSE")
-		set(${_sse2_flags} "/arch:SSE2")
-	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
-		set(${_sse_flags} "")  # icc defaults to -msse
-		set(${_sse2_flags} "-msse2")
-	else()
-		message(WARNING "SSE flags for this compiler: '${CMAKE_C_COMPILER_ID}' not known")
-		set(${_sse_flags})
-		set(${_sse2_flags})
-	endif()
-
-	set(CMAKE_REQUIRED_FLAGS "${${_sse_flags}} ${${_sse2_flags}}")
-
-	if(NOT DEFINED SUPPORT_SSE_BUILD)
-		# result cached
-		check_c_source_runs("
-			#include <xmmintrin.h>
-			int main(void) { __m128 v = _mm_setzero_ps(); return 0; }"
-		SUPPORT_SSE_BUILD)
-
-		if(SUPPORT_SSE_BUILD)
-			message(STATUS "SSE Support: detected.")
-		else()
-			message(STATUS "SSE Support: missing.")
-		endif()
-	endif()
-
-	if(NOT DEFINED SUPPORT_SSE2_BUILD)
-		# result cached
-		check_c_source_runs("
-			#include <emmintrin.h>
-			int main(void) { __m128d v = _mm_setzero_pd(); return 0; }"
-		SUPPORT_SSE2_BUILD)
-
-		if(SUPPORT_SSE2_BUILD)
-			message(STATUS "SSE2 Support: detected.")
-		else()
-			message(STATUS "SSE2 Support: missing.")
-		endif()
-	endif()
-
-	unset(CMAKE_REQUIRED_FLAGS)
-endmacro()
-
-# when we have warnings as errors applied globally this
-# needs to be removed for some external libs which we dont maintain.
-
-# utility macro
-macro(remove_cc_flag
-	flag)
-
-	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
-	string(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-
-	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
-	string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-
-endmacro()
-
-macro(add_cc_flag
-	flag)
-
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-endmacro()
-
-macro(remove_strict_flags)
-
-	if(CMAKE_COMPILER_IS_GNUCC)
-		remove_cc_flag("-Wstrict-prototypes")
-		remove_cc_flag("-Wmissing-prototypes")
-		remove_cc_flag("-Wunused-parameter")
-		remove_cc_flag("-Wwrite-strings")
-		remove_cc_flag("-Wundef")
-		remove_cc_flag("-Wshadow")
-		remove_cc_flag("-Werror=[^ ]+")
-		remove_cc_flag("-Werror")
-
-		# negate flags implied by '-Wall'
-		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
-	endif()
-
-	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		remove_cc_flag("-Wunused-parameter")
-		remove_cc_flag("-Wunused-variable")
-		remove_cc_flag("-Werror")
-	endif()
-
-	if(MSVC)
-		# TODO
-	endif()
-
-endmacro()
-
-# note, we can only append flags on a single file so we need to negate the options.
-# at the moment we cant shut up ffmpeg deprecations, so use this, but will
-# probably add more removals here.
-macro(remove_strict_flags_file
-	filenames)
-
-	foreach(_SOURCE ${ARGV})
-
-		if(CMAKE_COMPILER_IS_GNUCC)
-			set_source_files_properties(${_SOURCE}
-				PROPERTIES
-					COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}"
-			)
-		endif()
-
-		if(MSVC)
-			# TODO
-		endif()
-
-	endforeach()	
-
-	unset(_SOURCE)
-
-endmacro()
-
-
-macro(ADD_CHECK_C_COMPILER_FLAG
-	_CFLAGS
-	_CACHE_VAR
-	_FLAG)
-
-	include(CheckCCompilerFlag)
-
-	CHECK_C_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
-	if(${_CACHE_VAR})
-		# message(STATUS "Using CFLAG: ${_FLAG}")
-		set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}")
-	else()
-		message(STATUS "Unsupported CFLAG: ${_FLAG}")
-	endif()
-endmacro()
-
-macro(ADD_CHECK_CXX_COMPILER_FLAG
-	_CXXFLAGS
-	_CACHE_VAR
-	_FLAG)
-
-	include(CheckCXXCompilerFlag)
-
-	CHECK_CXX_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
-	if(${_CACHE_VAR})
-		# message(STATUS "Using CXXFLAG: ${_FLAG}")
-		set(${_CXXFLAGS} "${${_CXXFLAGS}} ${_FLAG}")
-	else()
-		message(STATUS "Unsupported CXXFLAG: ${_FLAG}")
-	endif()
-endmacro()
-
-macro(get_blender_version)
-	# So cmake depends on BKE_blender.h, beware of inf-loops!
-	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
-
-	file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h _contents REGEX "^#define[ \t]+BLENDER_.*$")
-
-	string(REGEX REPLACE ".*#define[ \t]+BLENDER_VERSION[ \t]+([0-9]+).*" "\\1" _out_version "${_contents}")
-	string(REGEX REPLACE ".*#define[ \t]+BLENDER_SUBVERSION[ \t]+([0-9]+).*" "\\1" _out_subversion "${_contents}")
-	string(REGEX REPLACE ".*#define[ \t]+BLENDER_VERSION_CHAR[ \t]+([a-z]+).*" "\\1" _out_version_char "${_contents}")
-	string(REGEX REPLACE ".*#define[ \t]+BLENDER_VERSION_CYCLE[ \t]+([a-z]+).*" "\\1" _out_version_cycle "${_contents}")
-
-	if(NOT ${_out_version} MATCHES "[0-9]+")
-		message(FATAL_ERROR "Version parsing failed for BLENDER_VERSION")
-	endif()
-
-	if(NOT ${_out_subversion} MATCHES "[0-9]+")
-		message(FATAL_ERROR "Version parsing failed for BLENDER_SUBVERSION")
-	endif()
-
-	# clumsy regex, only single char are ok but it could be unset
-
-	string(LENGTH "${_out_version_char}" _out_version_char_len)
-	if(NOT _out_version_char_len EQUAL 1)
-		set(_out_version_char "")
-	elseif(NOT ${_out_version_char} MATCHES "[a-z]+")
-		message(FATAL_ERROR "Version parsing failed for BLENDER_VERSION_CHAR")
-	endif()
-
-	if(NOT ${_out_version_cycle} MATCHES "[a-z]+")
-		message(FATAL_ERROR "Version parsing failed for BLENDER_VERSION_CYCLE")
-	endif()
-
-	math(EXPR BLENDER_VERSION_MAJOR "${_out_version} / 100")
-	math(EXPR BLENDER_VERSION_MINOR "${_out_version} % 100")
-	set(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}")
-
-	set(BLENDER_SUBVERSION ${_out_subversion})
-	set(BLENDER_VERSION_CHAR ${_out_version_char})
-	set(BLENDER_VERSION_CYCLE ${_out_version_cycle})
-
-	# for packaging, alpha to numbers
-	string(COMPARE EQUAL "${BLENDER_VERSION_CHAR}" "" _out_version_char_empty)
-	if(${_out_version_char_empty})
-		set(BLENDER_VERSION_CHAR_INDEX "0")
-	else()
-		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w x y z)
-		list(FIND _char_ls ${BLENDER_VERSION_CHAR} _out_version_char_index)
-		math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
-		unset(_char_ls)
-		unset(_out_version_char_index)
-	endif()
-
-	unset(_out_subversion)
-	unset(_out_version_char)
-	unset(_out_version_char_empty)
-	unset(_out_version_cycle)
-
-	# message(STATUS "Version (Internal): ${BLENDER_VERSION}.${BLENDER_SUBVERSION}, Version (external): ${BLENDER_VERSION}${BLENDER_VERSION_CHAR}-${BLENDER_VERSION_CYCLE}")
-endmacro()
-
-
-# hacks to override initial project settings
-# these macros must be called directly before/after project(Blender)
-macro(blender_project_hack_pre)
-	# ----------------
-	# MINGW HACK START
-	# ignore system set flag, use our own
-	# must be before project(...)
-	# if the user wants to add their own its ok after first run.
-	if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
-		set(_reset_standard_libraries OFF)
-	else()
-		set(_reset_standard_libraries ON)
-	endif()
-
-	# ------------------
-	# GCC -O3 HACK START
-	# needed because O3 can cause problems but
-	# allow the builder to set O3 manually after.
-	if(DEFINED CMAKE_C_FLAGS_RELEASE)
-		set(_reset_standard_cflags_rel OFF)
-	else()
-		set(_reset_standard_cflags_rel ON)
-	endif()
-	if(DEFINED CMAKE_CXX_FLAGS_RELEASE)
-		set(_reset_standard_cxxflags_rel OFF)
-	else()
-		set(_reset_standard_cxxflags_rel ON)
-	endif()
-endmacro()
-
-
-macro(blender_project_hack_post)
-	# --------------
-	# MINGW HACK END
-	if (_reset_standard_libraries)
-		# Must come after projecINCt(...)
-		#
-		# MINGW workaround for -ladvapi32 being included which surprisingly causes
-		# string formatting of floats, eg: printf("%.*f", 3, value). to crash blender
-		# with a meaningless stack trace. by overriding this flag we ensure we only
-		# have libs we define and that cmake & scons builds match.
-		set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
-		set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
-		mark_as_advanced(
-			CMAKE_C_STANDARD_LIBRARIES
-			CMAKE_CXX_STANDARD_LIBRARIES
-		)
-	endif()
-	unset(_reset_standard_libraries)
-
-
-	# ----------------
-	# GCC -O3 HACK END
-	if(_reset_standard_cflags_rel)
-		string(REGEX REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "" FORCE)
-		mark_as_advanced(CMAKE_C_FLAGS_RELEASE)
-	endif()
-
-	if(_reset_standard_cxxflags_rel)
-		string(REGEX REPLACE "-O3" "-O2" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "" FORCE)
-		mark_as_advanced(CMAKE_CXX_FLAGS_RELEASE)
-	endif()
-
-	unset(_reset_standard_cflags_rel)
-	unset(_reset_standard_cxxflags_rel)
-
-	# ------------------------------------------------------------------
-	# workaround for omission in cmake 2.8.4's GNU.cmake, fixed in 2.8.5
-	if(CMAKE_COMPILER_IS_GNUCC)
-		if(NOT DARWIN)
-			set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
-		endif()
-	endif()
-
-endmacro()
-
-# pair of macros to allow libraries to be specify files to install, but to
-# only install them at the end so the directories don't get cleared with
-# the files in them. used by cycles to install addon.
-macro(delayed_install
-	base
-	files
-	destination)
-
-	foreach(f ${files})
-		set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${base}/${f})
-		set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_DESTINATIONS ${destination})
-	endforeach()
-endmacro()
-
-# note this is a function instead of a macro so that ${BUILD_TYPE} in targetdir
-# does not get expanded in calling but is preserved
-function(delayed_do_install
-	targetdir)
-
-	get_property(files GLOBAL PROPERTY DELAYED_INSTALL_FILES)
-	get_property(destinations GLOBAL PROPERTY DELAYED_INSTALL_DESTINATIONS)
-
-	if(files)
-		list(LENGTH files n)
-		math(EXPR n "${n}-1")
-
-		foreach(i RANGE ${n})
-			list(GET files ${i} f)
-			list(GET destinations ${i} d)
-			install(FILES ${f} DESTINATION ${targetdir}/${d})
-		endforeach()
-	endif()
-endfunction()
-
-macro(set_lib_path
-		lvar
-		lproj)
-
-	if(MSVC10)
-		set(${lvar} ${LIBDIR}/${lproj}/vc2010)
-	else()
-		set(${lvar} ${LIBDIR}/${lproj})
-	endif()
-endmacro()
-
-
-macro(data_to_c
-      file_from file_to
-      list_to_add)
-
-	list(APPEND ${list_to_add} ${file_to})
-
-	get_filename_component(_file_to_path ${file_to} PATH)
-
-	add_custom_command(
-		OUTPUT ${file_to}
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
-		DEPENDS ${file_from} datatoc)
-	unset(_file_to_path)
-endmacro()
-
-
-# same as above but generates the var name and output automatic.
-macro(data_to_c_simple
-      file_from
-      list_to_add)
-
-	# remove ../'s
-	get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}   REALPATH)
-	get_filename_component(_file_to   ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH)
-
-	list(APPEND ${list_to_add} ${_file_to})
-
-	get_filename_component(_file_to_path ${_file_to} PATH)
-
-	add_custom_command(
-		OUTPUT  ${_file_to}
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
-		DEPENDS ${_file_from} datatoc)
-
-	unset(_file_from)
-	unset(_file_to)
-	unset(_file_to_path)
-endmacro()
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -1,88 +0,0 @@
-set(PROJECT_DESCRIPTION  "Blender is a very fast and versatile 3D modeller/renderer.")
-set(PROJECT_COPYRIGHT    "Copyright (C) 2001-2012 Blender Foundation")
-set(PROJECT_CONTACT      "foundation@blender.org")
-set(PROJECT_VENDOR       "Blender Foundation")
-set(ORG_WEBSITE          "www.blender.org")
-
-set(MAJOR_VERSION ${BLENDER_VERSION_MAJOR})
-set(MINOR_VERSION ${BLENDER_VERSION_MINOR})
-set(PATCH_VERSION ${BLENDER_VERSION_CHAR_INDEX})
-
-set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
-set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
-set(CPACK_PACKAGE_VENDOR ${PROJECT_VENDOR})
-set(CPACK_PACKAGE_CONTACT ${PROJECT_CONTACT})
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-SET(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${MINOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}")
-
-
-# Get the build revision, note that this can get out-of-sync, so for packaging run cmake first.
-include(FindSubversion)
-set(MY_WC_REVISION "unknown")
-if(EXISTS ${CMAKE_SOURCE_DIR}/.svn/)
-	if(Subversion_FOUND)
-		Subversion_WC_INFO(${CMAKE_SOURCE_DIR} MY)
-	endif()
-endif()
-set(BUILD_REV ${MY_WC_REVISION})
-
-
-# Force Package Name
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-1.r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	# RPM packages
-	include(build_files/cmake/RpmBuild.cmake)
-	if(RPMBUILD_FOUND AND NOT WIN32)
-		set(CPACK_GENERATOR "RPM")
-		set(CPACK_RPM_PACKAGE_RELEASE "1.r${BUILD_REV}")
-		set(CPACK_SET_DESTDIR "true")
-		set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
-		set(CPACK_PACKAGE_RELOCATABLE "false")
-		set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
-		set(CPACK_RPM_PACKAGE_GROUP "Amusements/Multimedia")
-		set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in")
-	endif()
-endif()
-
-# Mac Bundle
-if(APPLE)
-	set(CPACK_GENERATOR "DragNDrop")
-
-	# Libraries are bundled directly
-	set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
-endif()
-
-set(CPACK_PACKAGE_EXECUTABLES "blender")
-include(CPack)
-
-# Target for build_archive.py script, to automatically pass along
-# version, revision, platform, build directory
-macro(add_package_archive packagename extension)
-	set(build_archive python ${CMAKE_SOURCE_DIR}/build_files/package_spec/build_archive.py)
-	set(package_output ${CMAKE_BINARY_DIR}/release/${packagename}.${extension})
-
-	add_custom_target(package_archive DEPENDS ${package_output})
-
-	add_custom_command(
-		OUTPUT ${package_output}
-		COMMAND ${build_archive} ${packagename} ${extension} bin release
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-endmacro()
-
-if(APPLE)
-	add_package_archive(
-		"${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
-		"zip")
-elseif(UNIX)
-	# platform name could be tweaked, to include glibc, and ensure processor is correct (i386 vs i686)
-	string(TOLOWER ${CMAKE_SYSTEM_NAME} PACKAGE_SYSTEM_NAME)
-
-	add_package_archive(
-		"${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
-		"tar.bz2")
-endif()
-
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -1,251 +0,0 @@
-#!/usr/bin/env python3.2
-
-# ***** 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.
-#
-# Contributor(s): Campbell Barton, M.G. Kishalmi
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-"""
-Example Win32 usage:
- c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
-
-example linux usage
- python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
-"""
-
-__all__ = (
-    "SIMPLE_PROJECTFILE",
-    "SOURCE_DIR",
-    "CMAKE_DIR",
-    "PROJECT_DIR",
-    "source_list",
-    "is_project_file",
-    "is_c_header",
-    "is_py",
-    "cmake_advanced_info",
-    "cmake_compiler_defines",
-    "project_name_get"
-)
-
-
-import sys
-if not sys.version.startswith("3"):
-    print("\nPython3.x needed, found %s.\nAborting!\n" %
-          sys.version.partition(" ")[0])
-    sys.exit(1)
-
-
-import os
-from os.path import join, dirname, normpath, abspath, splitext, exists
-
-SOURCE_DIR = join(dirname(__file__), "..", "..")
-SOURCE_DIR = normpath(SOURCE_DIR)
-SOURCE_DIR = abspath(SOURCE_DIR)
-
-SIMPLE_PROJECTFILE = False
-
-# get cmake path
-CMAKE_DIR = sys.argv[-1]
-
-if not exists(join(CMAKE_DIR, "CMakeCache.txt")):
-    CMAKE_DIR = os.getcwd()
-if not exists(join(CMAKE_DIR, "CMakeCache.txt")):
-    print("CMakeCache.txt not found in %r or %r\n    Pass CMake build dir as an argument, or run from that dir, aborting" % (CMAKE_DIR, os.getcwd()))
-    sys.exit(1)
-
-
-# could be either.
-# PROJECT_DIR = SOURCE_DIR
-PROJECT_DIR = CMAKE_DIR
-
-
-def source_list(path, filename_check=None):
-    for dirpath, dirnames, filenames in os.walk(path):
-
-        # skip '.svn'
-        if dirpath.startswith("."):
-            continue
-
-        for filename in filenames:
-            filepath = join(dirpath, filename)
-            if filename_check is None or filename_check(filepath):
-                yield filepath
-
-
-# extension checking
-def is_cmake(filename):
-    ext = splitext(filename)[1]
-    return (ext == ".cmake") or (filename.endswith("CMakeLists.txt"))
-
-
-def is_c_header(filename):
-    ext = splitext(filename)[1]
-    return (ext in (".h", ".hpp", ".hxx"))
-
-
-def is_py(filename):
-    ext = splitext(filename)[1]
-    return (ext == ".py")
-
-
-def is_glsl(filename):
-    ext = splitext(filename)[1]
-    return (ext == ".glsl")
-
-
-def is_c(filename):
-    ext = splitext(filename)[1]
-    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
-
-
-def is_c_any(filename):
-    return is_c(filename) or is_c_header(filename)
-
-
-def is_svn_file(filename):
-    dn, fn = os.path.split(filename)
-    filename_svn = join(dn, ".svn", "text-base", "%s.svn-base" % fn)
-    return exists(filename_svn)
-
-
-def is_project_file(filename):
-    return (is_c_any(filename) or is_cmake(filename) or is_glsl(filename))  # and is_svn_file(filename)
-
-
-def cmake_advanced_info():
-    """ Extracr includes and defines from cmake.
-    """
-
-    def create_eclipse_project():
-        print("CMAKE_DIR %r" % CMAKE_DIR)
-        if sys.platform == "win32":
-            cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
-        else:
-            cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
-
-        os.system(cmd)
-
-    includes = []
-    defines = []
-
-    create_eclipse_project()
-
-    from xml.dom.minidom import parse
-    tree = parse(join(CMAKE_DIR, ".cproject"))
-
-    # to check on nicer xml
-    # f = open(".cproject_pretty", 'w')
-    # f.write(tree.toprettyxml(indent="    ", newl=""))
-
-    ELEMENT_NODE = tree.ELEMENT_NODE
-
-    cproject, = tree.getElementsByTagName("cproject")
-    for storage in cproject.childNodes:
-        if storage.nodeType != ELEMENT_NODE:
-            continue
-
-        if storage.attributes["moduleId"].value == "org.eclipse.cdt.core.settings":
-            cconfig = storage.getElementsByTagName("cconfiguration")[0]
-            for substorage in cconfig.childNodes:
-                if substorage.nodeType != ELEMENT_NODE:
-                    continue
-
-                moduleId = substorage.attributes["moduleId"].value
-
-                # org.eclipse.cdt.core.settings
-                # org.eclipse.cdt.core.language.mapping
-                # org.eclipse.cdt.core.externalSettings
-                # org.eclipse.cdt.core.pathentry
-                # org.eclipse.cdt.make.core.buildtargets
-
-                if moduleId == "org.eclipse.cdt.core.pathentry":
-                    for path in substorage.childNodes:
-                        if path.nodeType != ELEMENT_NODE:
-                            continue
-                        kind = path.attributes["kind"].value
-
-                        if kind == "mac":
-                            # <pathentry kind="mac" name="PREFIX" path="" value="&quot;/opt/blender25&quot;"/>
-                            defines.append((path.attributes["name"].value, path.attributes["value"].value))
-                        elif kind == "inc":
-                            # <pathentry include="/data/src/blender/blender/source/blender/editors/include" kind="inc" path="" system="true"/>
-                            includes.append(path.attributes["include"].value)
-                        else:
-                            pass
-
-    return includes, defines
-
-
-def cmake_cache_var(var):
-    cache_file = open(join(CMAKE_DIR, "CMakeCache.txt"), encoding='utf-8')
-    lines = [l_strip for l in cache_file for l_strip in (l.strip(),) if l_strip if not l_strip.startswith("//") if not l_strip.startswith("#")]
-    cache_file.close()
-
-    for l in lines:
-        if l.split(":")[0] == var:
-            return l.split("=", 1)[-1]
-    return None
-
-
-def cmake_compiler_defines():
-    compiler = cmake_cache_var("CMAKE_C_COMPILER")  # could do CXX too
-
-    if compiler is None:
-        print("Couldn't find the compiler, os defines will be omitted...")
-        return
-
-    import tempfile
-    temp_c = tempfile.mkstemp(suffix=".c")[1]
-    temp_def = tempfile.mkstemp(suffix=".def")[1]
-
-    os.system("%s -dM -E %s > %s" % (compiler, temp_c, temp_def))
-
-    temp_def_file = open(temp_def)
-    lines = [l.strip() for l in temp_def_file if l.strip()]
-    temp_def_file.close()
-
-    os.remove(temp_c)
-    os.remove(temp_def)
-    return lines
-
-
-def project_name_get(path, fallback="Blender", prefix="Blender_"):
-    if not os.path.isdir(os.path.join(path, ".svn")):
-        return fallback
-
-    import subprocess
-    try:
-        info = subprocess.Popen(["svn", "info", path],
-                                stdout=subprocess.PIPE).communicate()[0]
-    except:
-        # possibly 'svn' isnt found/installed
-        return fallback
-
-    # string version, we only want the URL
-    info = info.decode(encoding="utf-8", errors="ignore")
-
-    for l in info.split("\n"):
-        l = l.strip()
-        if l.startswith("URL"):
-            # https://svn.blender.org/svnroot/bf-blender/branches/bmesh/blender
-            # --> bmesh
-            if "/branches/" in l:
-                return prefix + l.rsplit("/branches/", 1)[-1].split("/", 1)[0]
-    return fallback
--- a/build_files/cmake/project_source_info.py
+++ b/build_files/cmake/project_source_info.py
@@ -1,205 +0,0 @@
-# ***** 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.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-__all__ = (
-    "build_info",
-    "SOURCE_DIR",
-    )
-
-
-import sys
-if not sys.version.startswith("3"):
-    print("\nPython3.x needed, found %s.\nAborting!\n" %
-          sys.version.partition(" ")[0])
-    sys.exit(1)
-
-
-import os
-from os.path import join, dirname, normpath, abspath
-
-SOURCE_DIR = join(dirname(__file__), "..", "..")
-SOURCE_DIR = normpath(SOURCE_DIR)
-SOURCE_DIR = abspath(SOURCE_DIR)
-
-
-def is_c_header(filename):
-    ext = os.path.splitext(filename)[1]
-    return (ext in (".h", ".hpp", ".hxx"))
-
-
-def is_c(filename):
-    ext = os.path.splitext(filename)[1]
-    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
-
-
-def is_c_any(filename):
-    return os.path.s_c(filename) or is_c_header(filename)
-
-
-# copied from project_info.py
-CMAKE_DIR = "."
-
-
-def cmake_cache_var(var):
-    cache_file = open(join(CMAKE_DIR, "CMakeCache.txt"))
-    lines = [l_strip for l in cache_file for l_strip in (l.strip(),) if l_strip if not l_strip.startswith("//") if not l_strip.startswith("#")]
-    cache_file.close()
-
-    for l in lines:
-        if l.split(":")[0] == var:
-            return l.split("=", 1)[-1]
-    return None
-
-
-def do_ignore(filepath, ignore_prefix_list):
-    if ignore_prefix_list is None:
-        return False
-
-    relpath = os.path.relpath(filepath, SOURCE_DIR)
-    return any([relpath.startswith(prefix) for prefix in ignore_prefix_list])
-
-
-def makefile_log():
-    import subprocess
-    import time
-
-    print("running make with --dry-run ...")
-    process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
-                                stdout=subprocess.PIPE,
-                               )
-
-    while process.poll():
-        time.sleep(1)
-
-    out = process.stdout.read()
-    process.stdout.close()
-    print("done!", len(out), "bytes")
-    return out.decode("utf-8", errors="ignore").split("\n")
-
-
-def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None):
-
-    makelog = makefile_log()
-
-    source = []
-
-    compilers = []
-    if use_c:
-        compilers.append(cmake_cache_var("CMAKE_C_COMPILER"))
-    if use_cxx:
-        compilers.append(cmake_cache_var("CMAKE_CXX_COMPILER"))
-
-    print("compilers:", " ".join(compilers))
-
-    fake_compiler = "%COMPILER%"
-
-    print("parsing make log ...")
-
-    for line in makelog:
-
-        args = line.split()
-
-        if not any([(c in args) for c in compilers]):
-            continue
-
-        # join args incase they are not.
-        args = ' '.join(args)
-        args = args.replace(" -isystem", " -I")
-        args = args.replace(" -D ", " -D")
-        args = args.replace(" -I ", " -I")
-
-        for c in compilers:
-            args = args.replace(c, fake_compiler)
-        args = args.split()
-        # end
-
-        # remove compiler
-        args[:args.index(fake_compiler) + 1] = []
-
-        c_files = [f for f in args if is_c(f)]
-        inc_dirs = [f[2:].strip() for f in args if f.startswith('-I')]
-        defs = [f[2:].strip() for f in args if f.startswith('-D')]
-        for c in sorted(c_files):
-
-            if do_ignore(c, ignore_prefix_list):
-                continue
-
-            source.append((c, inc_dirs, defs))
-
-        # safety check that our includes are ok
-        for f in inc_dirs:
-            if not os.path.exists(f):
-                raise Exception("%s missing" % f)
-
-    print("done!")
-
-    return source
-
-
-# could be moved elsewhere!, this just happens to be used by scripts that also
-# use this module.
-def queue_processes(process_funcs, job_total=-1):
-    """ Takes a list of function arg pairs, each function must return a process
-    """
-
-    if job_total == -1:
-        import multiprocessing
-        job_total = multiprocessing.cpu_count()
-        del multiprocessing
-
-    if job_total == 1:
-        for func, args in process_funcs:
-            sys.stdout.flush()
-            sys.stderr.flush()
-
-            process = func(*args)
-            process.wait()
-    else:
-        import time
-
-        processes = []
-        for func, args in process_funcs:
-            # wait until a thread is free
-            while 1:
-                processes[:] = [p for p in processes if p.poll() is None]
-
-                if len(processes) <= job_total:
-                    break
-                else:
-                    time.sleep(0.1)
-
-            sys.stdout.flush()
-            sys.stderr.flush()
-
-            processes.append(func(*args))
-
-
-def main():
-    if not os.path.exists(join(CMAKE_DIR, "CMakeCache.txt")):
-        print("This script must run from the cmake build dir")
-        return
-
-    for s in build_info():
-        print(s)
-
-if __name__ == "__main__":
-    main()
--- a/build_files/package_spec/build_archive.py
+++ b/build_files/package_spec/build_archive.py
@@ -1,70 +0,0 @@
-#!/usr/bin/python
-
-# <pep8 compliant>
-
-import os
-import shutil
-import subprocess
-import sys
-
-# todo:
-# strip executables
-
-# get parameters
-if len(sys.argv) < 5:
-    sys.stderr.write('Excepted arguments: ./build_archive.py name extension install_dir output_dir')
-    sys.exit(1)
-
-package_name = sys.argv[1]
-extension = sys.argv[2]
-install_dir = sys.argv[3]
-output_dir = sys.argv[4]
-
-package_archive = os.path.join(output_dir, package_name + '.' + extension)
-package_dir = package_name
-
-# remove existing package with the same name
-try:
-    if os.path.exists(package_archive):
-        os.remove(package_archive)
-    if os.path.exists(package_dir):
-        shutil.rmtree(package_dir)
-except Exception, ex:
-    sys.stderr.write('Failed to clean up old package files: ' + str(ex) + '\n')
-    sys.exit(1)
-
-# create temporary package dir
-try:
-    shutil.copytree(install_dir, package_dir)
-
-    for f in os.listdir(package_dir):
-        if f.startswith('makes'):
-            os.remove(os.path.join(package_dir, f))
-except Exception, ex:
-    sys.stderr.write('Failed to copy install directory: ' + str(ex) + '\n')
-    sys.exit(1)
-
-# create archive
-try:
-    if not os.path.exists(output_dir):
-        os.mkdir(output_dir)
-
-    if extension == 'zip':
-        archive_cmd = ['zip', '-9', '-r', package_archive, package_dir]
-    elif extension == 'tar.bz2':
-        archive_cmd = ['tar', 'cjf', package_archive, package_dir]
-    else:
-        sys.stderr.write('Unknown archive extension: ' + extension)
-        sys.exit(-1)
-
-    subprocess.call(archive_cmd)
-except Exception, ex:
-    sys.stderr.write('Failed to create package archive: ' + str(ex) + '\n')
-    sys.exit(1)
-
-# empty temporary package dir
-try:
-    shutil.rmtree(package_dir)
-except Exception, ex:
-    sys.stderr.write('Failed to clean up package directory: ' + str(ex) + '\n')
-    sys.exit(1)
--- a/build_files/package_spec/build_debian.sh
+++ b/build_files/package_spec/build_debian.sh
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Builds a debian package from SVN source.
-#
-# For paralelle builds use:
-#  DEB_BUILD_OPTIONS="parallel=5" sh build_files/package_spec/build_debian.sh
-
-# this needs to run in the root dir.
-cd $(dirname $0)/../../
-rm -rf debian
-cp -a build_files/package_spec/debian .
-
-
-# Get values from blender to use in debian/changelog.
-# value may be formatted: 35042:35051M
-BLENDER_REVISION=$(svnversion | cut -d: -f2 | tr -dc 0-9)
-
-blender_version=$(grep BLENDER_VERSION source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' source/blender/blenkernel/BKE_blender.h)
-BLENDER_VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)
-
-# map the version a -> 1, to conform to debian naming convention
-# not to be confused with blender's internal subversions
-if [ "$blender_version_char" ]; then
-    BLENDER_VERSION=${BLENDER_VERSION}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
-fi
-
-DEB_VERSION=${BLENDER_VERSION}+svn${BLENDER_REVISION}-bf
-
-# update debian/changelog
-dch -b -v $DEB_VERSION "New upstream SVN snapshot."
-
-
-# run the rules makefile
-rm -rf get-orig-source
-debian/rules get-orig-source SVN_URL=.
-mv *.gz ../
-
-# build the package
-debuild -i -us -uc -b
-
-
-# remove temp dir
-rm -rf debian
--- a/build_files/package_spec/debian/changelog
+++ b/build_files/package_spec/debian/changelog
@@ -1,5 +0,0 @@
-blender (2.56+svn34749-bf) unstable; urgency=low
-
-  * New upstream SVN snapshot.
-
- -- Dan Eicher <dan@trollwerks.org>  Wed, 09 Feb 2011 18:55:24 -0700
--- a/build_files/package_spec/debian/compat
+++ b/build_files/package_spec/debian/compat
@@ -1 +0,0 @@
-7
--- a/build_files/package_spec/debian/control
+++ b/build_files/package_spec/debian/control
@@ -1,24 +0,0 @@
-Source: blender
-Section: graphics
-Priority: extra
-Maintainer: Dan Eicher <dan@trollwerks.org>
-Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.2-dev, libopenjpeg-dev
-Standards-Version: 3.9.1
-Homepage: http://blender.org/
-X-Python3-Version: >= 3.2, << 3.3
-
-Package: blender-snapshot
-Architecture: any
-Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
-Provides: blender
-Conflicts: blender
-Replaces: blender
-Description: Very fast and versatile 3D modeller/renderer
- Blender is an integrated 3d suite for modelling, animation, rendering,
- post-production, interactive creation and playback (games). Blender has its
- own particular user interface, which is implemented entirely in OpenGL and
- designed with speed in mind. Python bindings are available for scripting;
- import/export features for popular file formats like 3D Studio and Wavefront
- Obj are implemented as scripts by the community. Stills, animations, models
- for games or other third party engines and interactive content in the form of
- a standalone binary and/or a web plug-in are common products of Blender use.
--- a/build_files/package_spec/debian/copyright
+++ b/build_files/package_spec/debian/copyright
@@ -1,41 +0,0 @@
-This work was packaged for Debian by:
-
-    Dan Eicher <dan@trollwerks.org> on Tue, 08 Feb 2011 21:59:32 -0700
-
-It was downloaded from:
-
-    http://blender.org
-
-Copyright: 
-
-    Copyright (C) 2002-2011 Blender Foundation
-
-License:
-
-    This package 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 package 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, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-
-The Debian packaging is:
-
-    Copyright (C) 2011 Dan Eicher <dan@trollwerks.org>
-
-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.
-
-
--- a/build_files/package_spec/debian/docs
+++ b/build_files/package_spec/debian/docs
@@ -1,2 +0,0 @@
-release/text/copyright.txt
-release/text/readme.html
--- a/build_files/package_spec/debian/menu
+++ b/build_files/package_spec/debian/menu
@@ -1,4 +0,0 @@
-?package(blender-snapshot):needs="X11" section="Applications/Graphics"\
-  longtitle="Blender 3D modeler / renderer"\
-  icon="/usr/share/icons/hicolor/scalable/apps/blender.svg"\
-  title="blender" command="/usr/bin/blender"
--- a/build_files/package_spec/debian/rules
+++ b/build_files/package_spec/debian/rules
@@ -1,44 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-SVN_URL := https://svn.blender.org/svnroot/bf-blender/trunk/blender
-REV := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p')
-VER := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-REL := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]+\.[0-9]+).*,\1,p')
-TARBALL = blender_$(VER).orig.tar.gz
-BLDDIR = debian/cmake
-
-%:
-	dh $@ -Scmake -B$(BLDDIR) --parallel --with python3 --without python-support
-
-override_dh_auto_configure:
-	# blender spesific CMake options
-	dh_auto_configure -- \
-		-DCMAKE_BUILD_TYPE:STRING=Release \
-		-DWITH_INSTALL_PORTABLE:BOOL=OFF \
-		-DWITH_PYTHON_INSTALL:BOOL=OFF \
-		-DWITH_OPENCOLLADA:BOOL=OFF
-
-override_dh_auto_test:
-	# don't run CTest
-
-override_dh_install:
-	dh_install
-
-	# remove duplicated docs
-	rm -rf debian/blender-snapshot/usr/share/doc/blender
-
-override_dh_python3:
-	dh_python3 -V 3.2-3.3 /usr/share/blender/$(REL)/scripts
-
-get-orig-source:
-	rm -rf get-orig-source $(TARBALL)
-	mkdir get-orig-source
-	if [ "$(SVN_URL)" = . ] && [ `svnversion` = "$(REV)" ]; then \
-		svn -q export . get-orig-source/blender-$(VER); \
-	else \
-		svn -q export -r $(REV) $(SVN_URL) get-orig-source/blender-$(VER); \
-	fi
-	GZIP='--best --no-name' tar czf $(TARBALL) -C get-orig-source blender-$(VER)
-	rm -rf get-orig-source
-	@echo "$(TARBALL) created; move it to the right destination to build the package"
--- a/build_files/package_spec/debian/source/format
+++ b/build_files/package_spec/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/build_files/package_spec/debian/watch
+++ b/build_files/package_spec/debian/watch
@@ -1,3 +0,0 @@
-version=3
-opts=uversionmangle=s/[a-z]$/.$&/;s/[j-s]$/1$&/;s/[t-z]$/2$&/;tr/a-z/1-90-90-6/ \
-http://download.blender.org/source/blender-([0-9.]+[a-z]?)\.tar\.gz
--- a/build_files/package_spec/pacman/PKGBUILD
+++ b/build_files/package_spec/pacman/PKGBUILD
@@ -1,70 +0,0 @@
-# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
-
-# custom blender vars
-blender_srcdir=$(dirname $startdir)"/../.."
-# value may be formatted: 35042:35051M
-blender_revision=$(svnversion $blender_srcdir | cut -d: -f2 | awk '{print $3}')
-blender_version=$(grep "BLENDER_VERSION\s" $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
-blender_version=$(expr $blender_version / 100).$(expr $blender_version % 100)  # 256 -> 2.56
-blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blender_srcdir/source/blender/blenkernel/BKE_blender.h)
-# blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
-
-# map the version a -> 1
-# not to be confused with blender's internal subversions
-if [ "$blender_version_char" ]; then
-    blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
-else
-	blender_version_full=${blender_version}
-fi
-
-blender_ver_string=$blender_version+svn$blender_version_full
-
-pkgname=blender-snapshot
-pkgver=$blender_ver_string
-pkgrel=1
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-url="www.blender.org"
-license=('GPL')
-groups=()
-depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr'  'python>=3.2' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'ffmpeg')
-makedepends=('cmake' 'svn')
-optdepends=()
-provides=()
-conflicts=('blender')
-replaces=('blender')
-backup=()
-options=()
-install=blender.install
-# use current svn to make the package.
-# source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-# md5sums=('27edb80c82c25252d43d6a01980d953a') #generate with 'makepkg -g'
-source=()
-md5sums=()
-noextract=()
-
-build() {
-  mkdir -p $srcdir/build
-  cd $srcdir/build
-  cmake $blender_srcdir \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
-    -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=OFF \
-	-DPYTHON_VERSION:STRING=3.2 \
-	-DPYTHON_LIBPATH:STRING=/usr/lib \
-	-DPYTHON_LIBRARY:STRING=python3.2mu \
-	-DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu
-
-  make $MAKEFLAGS
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR="$pkgdir" install
-  python -m compileall \
-	$pkgdir/usr/share/blender/$blender_version/scripts/startup \
-	$pkgdir/usr/share/blender/$blender_version/scripts/modules \
-	$pkgdir/usr/share/blender/$blender_version/scripts/addons
-}
--- a/build_files/package_spec/pacman/blender.install
+++ b/build_files/package_spec/pacman/blender.install
@@ -1,29 +0,0 @@
-post_install() {
-  cat << EOF
-
-NOTE
----
-Happy blending!
-
-EOF
-  echo "update desktop mime database..."
-  update-desktop-database
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  echo "update desktop mime database..."
-  update-desktop-database
-}
-
-op=$1
-shift
-
-$op $*
--- a/build_files/package_spec/rpm/blender.spec.in
+++ b/build_files/package_spec/rpm/blender.spec.in
@@ -1,87 +0,0 @@
-# -*- rpm-spec -*-
-%global __python %{__python3}
-%global blender_api @CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@
-
-%define _rpmdir @CPACK_RPM_DIRECTORY@
-%define _rpmfilename @CPACK_RPM_FILE_NAME@
-%define _unpackaged_files_terminate_build 0
-%define _topdir @CPACK_RPM_DIRECTORY@
-
-BuildRoot:      @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
-Summary:        @CPACK_RPM_PACKAGE_SUMMARY@
-Name:           @CPACK_RPM_PACKAGE_NAME@
-Version:        @CPACK_RPM_PACKAGE_VERSION@
-Release:        @CPACK_RPM_PACKAGE_RELEASE@%{?dist}
-License:        @CPACK_RPM_PACKAGE_LICENSE@
-Group:          @CPACK_RPM_PACKAGE_GROUP@
-Vendor:         @CPACK_RPM_PACKAGE_VENDOR@
-Epoch:          1
-
-Requires(post):   desktop-file-utils
-Requires(post):   shared-mime-info
-Requires(postun): desktop-file-utils
-Requires(postun): shared-mime-info
-
-Provides:         blender(ABI) = %{blender_api}
-Provides:         blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:        blender-fonts <= 2.49a-9
-
-%description
-Blender is an integrated 3d suite for modelling, animation, rendering,
-post-production, interactive creation and playback (games). Blender has its
-own particular user interface, which is implemented entirely in OpenGL and
-designed with speed in mind. Python bindings are available for scripting;
-import/export features for popular file formats like 3D Studio and Wavefront
-Obj are implemented as scripts by the community. Stills, animations, models
-for games or other third party engines and interactive content in the form of
-a standalone binary and/or a web plug-in are common products of Blender use.
-
-# This is a shortcutted spec file generated by CMake RPM generator
-# we skip _install step because CPack does that for us.
-# We do only save CPack installed tree in _prepr
-# and then restore it in build.
-%prep
-mv ${RPM_BUILD_ROOT} "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot"
-
-%install
-if [ -e ${RPM_BUILD_ROOT} ];
-then
-  rm -rf ${RPM_BUILD_ROOT}
-fi
-mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
-
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py
-
-%find_lang %{name}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi 
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
-
-%postun
-%{_bindir}/update-desktop-database %{_datadir}/applications
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi || :
-
-%files -f blender.lang
-%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_datadir}/%{name}/%{blender_api}/datafiles/fonts
-%{_datadir}/%{name}/%{blender_api}/datafiles/colormanagement
-%{_datadir}/%{name}/%{blender_api}/scripts
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/doc/%{name}
-%{_mandir}/man1/%{name}.*
-
-%changelog
-@CPACK_RPM_SPEC_CHANGELOG@
--- a/build_files/scons/config/Modules/FindPython.py
+++ b/build_files/scons/config/Modules/FindPython.py
@@ -1,32 +0,0 @@
-import os
-
-def FindPython():
-    all_abi_flags = ['m', 'mu', '']
-
-    python = "/usr"
-    abi_flags = "m"  # Most common for linux distros
-    version = "3.2"
-
-    # Determine ABI flags used on this system
-    include = os.path.join(python, "include")
-    for cur_flags in all_abi_flags:
-        inc = os.path.join(include, "python" + version + cur_flags, "Python.h")
-        if os.path.exists(inc):
-            abi_flags = cur_flags
-            break
-
-    # Determine whether python is in /usr/lib or /usr/lib64
-    lib32 = os.path.join(python, "lib", "python" + version, "sysconfig.py")
-    lib64 = os.path.join(python, "lib64", "python" + version, "sysconfig.py")
-    if os.path.exists(lib32):
-        libpath = "${BF_PYTHON}/lib"
-    elif os.path.exists(lib64):
-        libpath = "${BF_PYTHON}/lib64"
-    else:
-        # roll back to default value
-        libpath = "${BF_PYTHON}/lib"
-
-    return {'PYTHON': python,
-            "VERSION": version,
-            'LIBPATH': libpath,
-            'ABI_FLAGS': abi_flags}
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -1,406 +0,0 @@
-#
-# Note : if you want to alter this file
-# copy it as a whole in the upper folder
-# as user-config.py
-# dont create a new file with only some
-# vars changed.
-
-import commands
-
-# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
-USE_SDK=True
-
-#############################################################################
-###################     Cocoa & architecture settings      ##################
-#############################################################################
-WITH_GHOST_COCOA=True
-MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
-
-
-cmd = 'uname -p'
-MAC_PROC=commands.getoutput(cmd)
-cmd = 'uname -r'
-cmd_res=commands.getoutput(cmd)
-
-if cmd_res[:1]=='7':
-    MAC_CUR_VER='10.3'
-elif cmd_res[:1]=='8':
-    MAC_CUR_VER='10.4'
-elif cmd_res[:1]=='9':
-    MAC_CUR_VER='10.5'
-elif cmd_res[:2]=='10':
-    MAC_CUR_VER='10.6'
-elif cmd_res[:2]=='11':
-    MAC_CUR_VER='10.7'
-elif cmd_res[:2]=='12':
-    MAC_CUR_VER='10.8'
-cmd = 'xcodebuild -version'
-cmd_xcode=commands.getoutput(cmd)
-XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
-cmd = 'xcodebuild -showsdks'
-cmd_sdk=commands.getoutput(cmd)
-MACOSX_SDK_CHECK=cmd_sdk
-
-if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
-    USE_QTKIT=True # Carbon quicktime is not available for 64bit
-
-
-# Default target OSX settings per architecture
-# Can be customized
-
-if MACOSX_ARCHITECTURE == 'ppc' and MAC_CUR_VER == '10.4':
-# all releases are now made for 10.5 !
-#   MAC_MIN_VERS = '10.3'
-#   MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-#   LCGDIR = '#../lib/darwin-6.1-powerpc'
-#   CC = 'gcc-3.3'
-#   CXX = 'g++-3.3'
-    MAC_MIN_VERS = '10.4'
-    MACOSX_DEPLOYMENT_TARGET = '10.4'
-    MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
-    LCGDIR = '#../lib/darwin-8.0.0-powerpc'
-    CC = 'gcc-4.0'
-    CXX = 'g++-4.0'
-elif MACOSX_ARCHITECTURE == 'i386' and MAC_CUR_VER == '10.4':
-    MAC_MIN_VERS = '10.4'
-    MACOSX_DEPLOYMENT_TARGET = '10.4'
-    MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
-    LCGDIR = '#../lib/darwin-8.x.i386'
-    CC = 'gcc-4.0'
-    CXX = 'g++-4.0'
-else :
-    if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
-        # OSX 10.5/6 with Xcode 3.x
-        MAC_MIN_VERS = '10.5'
-        MACOSX_DEPLOYMENT_TARGET = '10.5'
-        MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
-        LCGDIR = '#../lib/darwin-9.x.universal'
-        CC = 'gcc-4.2'
-        CXX = 'g++-4.2'
-    elif 'Mac OS X 10.6' in MACOSX_SDK_CHECK:
-        # OSX 10.6/7 with Xcode 4.x
-        MAC_MIN_VERS = '10.6'
-        MACOSX_DEPLOYMENT_TARGET = '10.6'
-        MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
-        LCGDIR = '#../lib/darwin-9.x.universal'
-        CC = 'gcc-4.2'
-        CXX = 'g++-4.2'
-    else:
-        # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
-        MAC_MIN_VERS = '10.6'
-        MACOSX_DEPLOYMENT_TARGET = '10.6'
-        MACOSX_SDK='/Developer/SDKs/MacOSX10.7.sdk'
-        LCGDIR = '#../lib/darwin-9.x.universal'
-        CC = 'gcc'
-        CXX = 'g++'
-
-LIBDIR = '${LCGDIR}'
-
-if XCODE_CUR_VER >= '4.3':  ## since version 4.3, XCode and developer dir are bundled ##
-	MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
-
-#############################################################################
-###################          Dependency settings           ##################
-#############################################################################
-
-#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
-# if your compiler does not have accurate suffix you may have to enable it by hand !
-if CC[:-2].endswith('4.6'):
-    WITH_BF_OPENMP = True  # multithreading for fluids, cloth, sculpt and smoke
-else:
-    WITH_BF_OPENMP = False
-
-# enable ffmpeg  support
-WITH_BF_FFMPEG = True
-BF_FFMPEG = LIBDIR + '/ffmpeg'
-BF_FFMPEG_INC = "${BF_FFMPEG}/include"
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
-#bz2 is a standard osx dynlib
-
-BF_PYTHON_VERSION = '3.2'
-WITH_OSX_STATICPYTHON = True
-
-if WITH_OSX_STATICPYTHON:
-    # python 3.2 uses precompiled libraries in bf svn /lib by default
-
-    BF_PYTHON = LIBDIR + '/python'
-    BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-    # BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-    BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
-    BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
-    # BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
-else:
-    # python 3.2 uses Python-framework additionally installed in /Library/Frameworks
-
-    BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
-    BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
-    BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
-    #BF_PYTHON_LIB = ''
-    BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-3.2m'
-
-WITH_BF_OPENAL = True
-#different lib must be used  following version of gcc
-# for gcc 3.3
-#BF_OPENAL = LIBDIR + '/openal'
-# for gcc 3.4 and ulterior
-if MAC_PROC == 'powerpc':
-    BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
-else :
-    BF_OPENAL = LIBDIR + '/openal'
-
-WITH_BF_STATICOPENAL = False
-BF_OPENAL_INC = '${BF_OPENAL}/include' # only headers from libdir needed for proper use of framework !!!!
-#BF_OPENAL_LIB = 'openal'
-#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-#BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_CXX = '/usr'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-# we use simply jack framework
-WITH_BF_JACK = True
-BF_JACK = '/Library/Frameworks/Jackmp.framework'
-BF_JACK_INC = '${BF_JACK}/headers'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = LIBDIR + '/sndfile'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'sndfile FLAC ogg vorbis vorbisenc'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib ${BF_FFMPEG}/lib' #ogg libs are stored in ffmpeg dir
-
-WITH_BF_SDL = True
-BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = '${LCGDIR}/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-
-WITH_BF_DDS = True
-
-#Color Management System
-WITH_BF_LCMS = False
-BF_LCMS = LIBDIR + '/lcms'
-BF_LCMS_INC = '${BF_LCMS}/include'
-BF_LCMS_LIB = 'lcms'
-BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
-
-WITH_BF_JPEG = True
-BF_JPEG = LIBDIR + '/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-WITH_BF_TIFF = True
-BF_TIFF = LIBDIR + '/tiff'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = '/usr'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = LIBDIR + '/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'intl'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/fftw3'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'libfftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-BF_FREETYPE = LIBDIR + '/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-
-WITH_BF_QUICKTIME = True
-
-WITH_BF_ICONV = True
-BF_ICONV = '/usr'
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-#BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = True
-BF_OPENGL_LIB = 'GL GLU'
-BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
-BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
-
-#OpenCollada flags
-WITH_BF_COLLADA = True
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada'
-BF_PCRE = LIBDIR + '/opencollada'
-BF_PCRE_LIB = 'pcre'
-BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
-#BF_EXPAT = '/usr'
-#BF_EXPAT_LIB = 'expat'
-#BF_EXPAT_LIBPATH = '/usr/lib'
-
-# Cycles
-WITH_BF_CYCLES = True
-
-WITH_BF_OIIO = True
-BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = BF_OIIO + '/include'
-BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = BF_OIIO + '/lib'
-
-WITH_BF_OCIO = True
-BF_OCIO = LIBDIR + '/opencolorio'
-BF_OCIO_INC = BF_OCIO + '/include'
-BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp'
-BF_OCIO_LIBPATH = BF_OCIO + '/lib'
-
-WITH_BF_BOOST = True
-BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt'
-BF_BOOST_LIBPATH = BF_BOOST + '/lib'
-
-WITH_BF_CYCLES_CUDA_BINARIES = False
-BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
-
-#Ray trace optimization
-if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
-    WITH_BF_RAYOPTIMIZATION = True
-else:
-    WITH_BF_RAYOPTIMIZATION = False
-if MACOSX_ARCHITECTURE == 'i386':
-    BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
-elif MACOSX_ARCHITECTURE == 'x86_64':
-    BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
-
-# SpaceNavigator and related 3D mice, driver must be 3DxWare 10 Beta 4 (Mac OS X) or later !
-WITH_BF_3DMOUSE = True
-
-#############################################################################
-###################  various compile settings and flags    ##################
-#############################################################################
-
-BF_QUIET = '1' # suppress verbose output
-
-if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
-    ARCH_FLAGS = ['-m64']
-else:
-    ARCH_FLAGS = ['-m32']
-
-CFLAGS = []
-CXXFLAGS = []
-CCFLAGS = ['-pipe','-funsigned-char']
-
-CPPFLAGS = list(ARCH_FLAGS)
-
-if WITH_GHOST_COCOA:
-    PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
-else:
-    PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
-
-if WITH_BF_QUICKTIME:
-    if USE_QTKIT:
-        PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
-    else:
-        PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
-
-if not WITH_OSX_STATICPYTHON:
-    PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python']
-
-
-#note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
-#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
-    LLIBS = ['stdc++']
-else:
-    LLIBS = ['stdc++', 'SystemStubs']
-
-# some flags shuffling for different OS versions
-if MAC_MIN_VERS == '10.3':
-    CCFLAGS = ['-fuse-cxa-atexit'] + CCFLAGS
-    PLATFORM_LINKFLAGS = ['-fuse-cxa-atexit'] + PLATFORM_LINKFLAGS
-    LLIBS.append('crt3.o')
-
-if USE_SDK:
-    SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE]
-    PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
-    CCFLAGS=SDK_FLAGS+CCFLAGS
-    CXXFLAGS=SDK_FLAGS+CXXFLAGS
-
-#Intel Macs are CoreDuo and Up
-if MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'x86_64':
-    REL_CFLAGS = []
-    REL_CXXFLAGS = []
-    REL_CCFLAGS = ['-DNDEBUG', '-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mfpmath=sse']
-else:
-    CCFLAGS += ['-fno-strict-aliasing']
-    REL_CFLAGS = []
-    REL_CXXFLAGS = []
-    REL_CCFLAGS = ['-DNDEBUG', '-O2']
-
-# Intel 64bit Macs are Core2Duo and up
-if MACOSX_ARCHITECTURE == 'x86_64':
-    REL_CCFLAGS += ['-march=core2','-mssse3','-with-tune=core2','-enable-threads']
-
-CC_WARN = ['-Wall']
-C_WARN = ['-Wno-char-subscripts', '-Wpointer-arith', '-Wcast-align', '-Wdeclaration-after-statement', '-Wno-unknown-pragmas', '-Wstrict-prototypes']
-CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
-
-##FIX_STUBS_WARNINGS = -Wno-unused
-
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
-BF_PROFILE_CCFLAGS = ['-pg', '-g ']
-BF_PROFILE_LINKFLAGS = ['-pg']
-BF_PROFILE = False
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
-
-#############################################################################
-###################           Output directories           ##################
-#############################################################################
-
-BF_BUILDDIR='../build/darwin'
-BF_INSTALLDIR='../install/darwin'
--- a/build_files/scons/config/freebsd7-config.py
+++ b/build_files/scons/config/freebsd7-config.py
@@ -1,212 +0,0 @@
-CC = 'gcc44'
-CXX = 'g++44'
-
-LCGDIR = '../lib/freebsd7'
-LIBDIR = "${LCGDIR}"
-
-BF_PYTHON_ABI_FLAGS = ''
-BF_PYTHON = '/usr/local'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = '/usr/local'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-BF_CXX = '/usr/local'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_JACK = True
-BF_JACK = '/usr/local'
-BF_JACK_INC = '${BF_JACK}/include/jack'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = '/usr/local'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = '/usr/local'
-# when compiling with your own openexr lib you might need to set...
-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = '/usr/local'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-
-WITH_BF_PNG = True
-BF_PNG = '/usr/local'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-
-WITH_BF_TIFF = True
-BF_TIFF = '/usr/local'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = '/usr'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = '/usr/local'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettextlib'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = False
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_FREETYPE = '/usr/local'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-
-### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_BINRELOC = True
-
-# enable ffmpeg  support
-WITH_BF_FFMPEG = True
-BF_FFMPEG = '/usr/local'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-
-# enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True
-BF_OGG = '/usr/local'
-BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/usr/local'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_REDCODE = False
-BF_REDCODE = '#extern/libredcode'
-BF_REDCODE_LIB = ''
-# BF_REDCODE_INC = '${BF_REDCODE}/include'
-BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
-BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = '/usr/local'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
-
-WITH_BF_COLLADA = False
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-BF_PCRE = '/usr/local'
-BF_PCRE_LIB = 'pcre'
-BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
-BF_EXPAT = '/usr/local'
-BF_EXPAT_LIB = 'expat'
-BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
-
-WITH_GHOST_XDND = False
-
-WITH_BF_OPENMP = True
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
-
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
-
-CPPFLAGS = []
-CXXFLAGS = []
-if WITH_BF_FFMPEG:
-    # libavutil needs UINT64_C()
-    CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2']
-##BF_DEPEND = True
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
-CC_WARN = ['-Wall']
-CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
-
-
-##FIX_STUBS_WARNINGS = -Wno-unused
-
-LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
-BF_PROFILE = False
-BF_PROFILE_CCFLAGS = ['-pg','-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
-
-BF_BUILDDIR = '../build/freebsd7'
-BF_INSTALLDIR='../install/freebsd7'
-
-#Link against pthread
-PLATFORM_LINKFLAGS = ['-pthread']
--- a/build_files/scons/config/freebsd8-config.py
+++ b/build_files/scons/config/freebsd8-config.py
@@ -1,212 +0,0 @@
-CC = 'gcc44'
-CXX = 'g++44'
-
-LCGDIR = '../lib/freebsd8'
-LIBDIR = "${LCGDIR}"
-
-BF_PYTHON_ABI_FLAGS = ''
-BF_PYTHON = '/usr/local'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = '/usr/local'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-BF_CXX = '/usr/local'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_JACK = True
-BF_JACK = '/usr/local'
-BF_JACK_INC = '${BF_JACK}/include/jack'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = '/usr/local'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = '/usr/local'
-# when compiling with your own openexr lib you might need to set...
-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = '/usr/local'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-
-WITH_BF_PNG = True
-BF_PNG = '/usr/local'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-
-WITH_BF_TIFF = True
-BF_TIFF = '/usr/local'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = '/usr'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = '/usr/local'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettextlib'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = False
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_FREETYPE = '/usr/local'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-
-### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_BINRELOC = True
-
-# enable ffmpeg  support
-WITH_BF_FFMPEG = True
-BF_FFMPEG = '/usr/local'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-
-# enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True
-BF_OGG = '/usr/local'
-BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/usr/local'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_REDCODE = False
-BF_REDCODE = '#extern/libredcode'
-BF_REDCODE_LIB = ''
-# BF_REDCODE_INC = '${BF_REDCODE}/include'
-BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
-BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = '/usr/local'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
-
-WITH_BF_COLLADA = False
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-BF_PCRE = '/usr/local'
-BF_PCRE_LIB = 'pcre'
-BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
-BF_EXPAT = '/usr/local'
-BF_EXPAT_LIB = 'expat'
-BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
-
-WITH_BF_OPENMP = True
-
-WITH_GHOST_XDND = False
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
-
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
-
-CPPFLAGS = []
-CXXFLAGS = []
-if WITH_BF_FFMPEG:
-    # libavutil needs UINT64_C()
-    CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2']
-##BF_DEPEND = True
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
-CC_WARN = ['-Wall']
-CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
-
-
-##FIX_STUBS_WARNINGS = -Wno-unused
-
-LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
-BF_PROFILE = False
-BF_PROFILE_CCFLAGS = ['-pg','-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
-
-BF_BUILDDIR = '../build/freebsd8'
-BF_INSTALLDIR='../install/freebsd8'
-
-#Link against pthread
-PLATFORM_LINKFLAGS = ['-pthread']
--- a/build_files/scons/config/freebsd9-config.py
+++ b/build_files/scons/config/freebsd9-config.py
@@ -1,212 +0,0 @@
-CC = 'gcc44'
-CXX = 'g++44'
-
-LCGDIR = '../lib/freebsd9'
-LIBDIR = "${LCGDIR}"
-
-BF_PYTHON_ABI_FLAGS = ''
-BF_PYTHON = '/usr/local'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = '/usr/local'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-BF_CXX = '/usr/local'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_JACK = True
-BF_JACK = '/usr/local'
-BF_JACK_INC = '${BF_JACK}/include/jack'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = '/usr/local'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = '/usr/local'
-# when compiling with your own openexr lib you might need to set...
-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = '/usr/local'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-
-WITH_BF_PNG = True
-BF_PNG = '/usr/local'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-
-WITH_BF_TIFF = True
-BF_TIFF = '/usr/local'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = '/usr'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = '/usr/local'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettextlib'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = False
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_FREETYPE = '/usr/local'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-
-### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_BINRELOC = True
-
-# enable ffmpeg  support
-WITH_BF_FFMPEG = True
-BF_FFMPEG = '/usr/local'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-
-# enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True
-BF_OGG = '/usr/local'
-BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/usr/local'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_REDCODE = False
-BF_REDCODE = '#extern/libredcode'
-BF_REDCODE_LIB = ''
-# BF_REDCODE_INC = '${BF_REDCODE}/include'
-BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
-BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = '/usr/local'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
-
-WITH_BF_COLLADA = False
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-BF_PCRE = '/usr/local'
-BF_PCRE_LIB = 'pcre'
-BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
-BF_EXPAT = '/usr/local'
-BF_EXPAT_LIB = 'expat'
-BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
-
-WITH_BF_OPENMP = True
-
-WITH_GHOST_XDND = False
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
-
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
-CXXFLAGS = []
-
-CPPFLAGS = []
-if WITH_BF_FFMPEG:
-    # libavutil needs UINT64_C()
-    CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2']
-##BF_DEPEND = True
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
-CC_WARN = ['-Wall']
-CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
-
-
-##FIX_STUBS_WARNINGS = -Wno-unused
-
-LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
-BF_PROFILE = False
-BF_PROFILE_CCFLAGS = ['-pg','-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
-
-BF_BUILDDIR = '../build/freebsd9'
-BF_INSTALLDIR='../install/freebsd9'
-
-#Link against pthread
-PLATFORM_LINKFLAGS = ['-pthread']
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -1,306 +0,0 @@
-# find library directory
-import platform
-import os
-from Modules.FindPython import FindPython
-
-bitness = platform.architecture()[0]
-if bitness == '64bit':
-    LCGDIR = '../lib/linux64'
-else:
-    LCGDIR = '../lib/linux'
-LIBDIR = "#${LCGDIR}"
-
-py = FindPython()
-
-BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS']
-BF_PYTHON = py['PYTHON']
-BF_PYTHON_LIBPATH = py['LIBPATH']
-BF_PYTHON_VERSION = py['VERSION']
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'  # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
-BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = '/usr'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-BF_CXX = '/usr'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_JACK = False
-BF_JACK = '/usr'
-BF_JACK_INC = '${BF_JACK}/include/jack'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = False
-WITH_BF_STATICSNDFILE = False
-BF_SNDFILE = '/usr'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
-
-WITH_BF_SDL = True
-BF_SDL = '/usr' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = '/usr'
-# when compiling with your own openexr lib you might need to set...
-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = '/usr'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-
-WITH_BF_PNG = True
-BF_PNG = '/usr'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-
-WITH_BF_TIFF = True
-BF_TIFF = '/usr'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = '/usr'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = '/usr'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettextlib'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-#WITH_BF_GETTEXT_STATIC = True
-#BF_GETTEXT_LIB_STATIC = '${BF_GETTEXT}/lib/libgettextlib.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-WITH_BF_ELTOPO = False
-BF_LAPACK = '/usr'
-BF_LAPACK_LIB = 'lapack3gf blas clapack'
-BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
-
-BF_FREETYPE = '/usr'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-#BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a'
-
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = False
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_BINRELOC = True
-
-# enable ffmpeg  support
-WITH_BF_FFMPEG = True
-BF_FFMPEG = LIBDIR + '/ffmpeg'
-if os.path.exists(LCGDIR + '/ffmpeg'):
-    WITH_BF_STATICFFMPEG = True
-    BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libfaad.a'
-else:
-    BF_FFMPEG = '/usr'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-#WITH_BF_STATICFFMPEG = True
-#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a'
-
-# enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = False
-BF_OGG = '/usr'
-BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
-
-WITH_BF_OPENJPEG = True 
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = False
-WITH_BF_STATICFFTW3 = False
-BF_FFTW3 = '/usr'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a'
-
-WITH_BF_REDCODE = False  
-BF_REDCODE = '#extern/libredcode'
-BF_REDCODE_LIB = ''
-# BF_REDCODE_INC = '${BF_REDCODE}/include'
-BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
-BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = '/usr'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
-
-WITH_BF_COLLADA = False
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-BF_PCRE = ''
-BF_PCRE_LIB = 'pcre'
-BF_PCRE_LIBPATH = '/usr/lib'
-BF_EXPAT = '/usr'
-BF_EXPAT_LIB = 'expat'
-BF_EXPAT_LIBPATH = '/usr/lib'
-
-WITH_BF_JEMALLOC = False
-WITH_BF_STATICJEMALLOC = False
-BF_JEMALLOC = '/usr'
-BF_JEMALLOC_INC = '${BF_JEMALLOC}/include'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-BF_JEMALLOC_LIB = 'jemalloc'
-BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
-
-WITH_BF_OIIO = True
-WITH_BF_STATICOIIO = False
-BF_OIIO = LIBDIR + '/oiio'
-if not os.path.exists(LCGDIR + '/oiio'):
-    WITH_BF_OIIO = False
-    BF_OIIO = '/usr'
-BF_OIIO_INC = BF_OIIO + '/include'
-BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = BF_OIIO + '/lib'
-
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = False
-BF_OCIO = LIBDIR + '/ocio'
-if not os.path.exists(LCGDIR + '/ocio'):
-    WITH_BF_OCIO = False
-    BF_OCIO = '/usr'
-BF_OCIO_INC = BF_OCIO + '/include'
-BF_OCIO_LIB = 'OpenColorIO yaml-cpp tinyxml'
-BF_OCIO_LIBPATH = BF_OCIO + '/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = False
-BF_BOOST = LIBDIR + '/boost'
-if not os.path.exists(LCGDIR + '/boost'):
-    WITH_BF_BOOST = False
-    BF_BOOST = '/usr'
-BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
-BF_BOOST_LIBPATH = BF_BOOST + '/lib'
-
-WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
-
-WITH_BF_CYCLES_CUDA_BINARIES = False
-BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-
-WITH_BF_OPENMP = True
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
-
-#SpaceNavigator and friends
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = False
-BF_3DMOUSE = '/usr'
-BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-BF_3DMOUSE_LIB = 'spnav'
-BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
-
-##
-CC = 'gcc'
-CXX = 'g++'
-##ifeq ($CPU),alpha)
-##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
-
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
-CXXFLAGS = []
-
-CPPFLAGS = []
-# g++ 4.6, only needed for bullet
-CXXFLAGS += ['-fpermissive']
-if WITH_BF_FFMPEG:
-    # libavutil needs UINT64_C()
-    CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2']
-##BF_DEPEND = True
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-parameter', '-Wstrict-prototypes', '-Werror=declaration-after-statement', '-Werror=implicit-function-declaration', '-Werror=return-type']
-CC_WARN = ['-Wall']
-CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
-
-
-##FIX_STUBS_WARNINGS = -Wno-unused
-
-LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
-##LOPTS = --dynamic
-##DYNLDFLAGS = -shared $(LDFLAGS)
-
-BF_PROFILE = False
-BF_PROFILE_CCFLAGS = ['-pg','-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
-
-BF_BUILDDIR = '../build/linux'
-BF_INSTALLDIR='../install/linux'
-
-#Link against pthread
-PLATFORM_LINKFLAGS = ['-pthread']
-
--- a/build_files/scons/config/linuxcross-config.py
+++ b/build_files/scons/config/linuxcross-config.py
@@ -1,195 +0,0 @@
-LCGDIR = '#../lib/windows'
-LIBDIR = '${LCGDIR}'
-
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
-BF_PYTHON_DLL = 'python31'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = False
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_CXX = '/usr'
-WITH_BF_STATICCXX = False
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-WITH_BF_SDL = True
-BF_SDL = LIBDIR + '/sdl'
-BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL'
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-WITH_BF_JACK = False
-BF_JACK = LIBDIR + '/jack'
-BF_JACK_INC = '${BF_JACK}/include'
-BF_JACK_LIB = 'jack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = False
-BF_SNDFILE = LIBDIR + '/sndfile'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'sndfile-1'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-BF_PTHREADS = LIBDIR + '/pthreads'
-BF_PTHREADS_INC = '${BF_PTHREADS}/include'
-BF_PTHREADS_LIB = 'pthreadGC2'
-BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = LIBDIR + '/gcc/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = ' Half IlmImf Iex IlmThread '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = LIBDIR + '/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-WITH_BF_TIFF = True
-BF_TIFF = LIBDIR + '/gcc/tiff'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = LIBDIR + '/zlib'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
-BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = LIBDIR + '/gcc/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'intl'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = False
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_WINTAB = LIBDIR + '/wintab'
-BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-
-BF_WITH_FREETYPE = True
-BF_FREETYPE = LIBDIR + '/gcc/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = False
-BF_ICONV = LIBDIR + "/gcc/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_BINRELOC = False
-
-# enable ffmpeg  support
-WITH_BF_FFMPEG = True
-BF_FFMPEG = LIBDIR + '/ffmpeg'
-BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = False
-BF_FFTW3 = LIBDIR + '/gcc/fftw3'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_REDCODE = False
-BF_REDCODE_INC = '#extern'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = 'C:\\MingW'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
-BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a']
-
-WITH_BF_OPENMP = False
-BF_OPENMP = LIBDIR + '/gcc/gomp'
-BF_OPENMP_INC = '${BF_OPENMP}/include'
-BF_OPENMP_LIBPATH = '${BF_OPENMP}/lib'
-
-WITH_BF_COLLADA = False
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-
-BF_OPENCOLLADA = LIBDIR + '/gcc/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib ${BF_ICONV_LIBPATH}'
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
-
-CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-CXXFLAGS = []
-
-CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE']
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG',  '-O2']
-C_WARN = ['-Wall', '-Wstrict-prototypes', '-Wno-char-subscripts', '-Wdeclaration-after-statement']
-
-CC_WARN = [ '-Wall' ]
-
-LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++', '-luuid', '-lole32'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
-
-PLATFORM_LINKFLAGS = ['--stack,2097152']
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
-
-BF_PROFILE = False
-BF_PROFILE_CCFLAGS = ['-pg','-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-
-BF_BUILDDIR = '../build/linuxcross'
-BF_INSTALLDIR='../install/linuxcross'
--- a/build_files/scons/config/win32-mingw-config.py
+++ b/build_files/scons/config/win32-mingw-config.py
@@ -1,216 +0,0 @@
-LCGDIR = '#../lib/mingw32'
-LIBDIR = "${LCGDIR}"
-
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
-BF_PYTHON_DLL = 'python32'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
-
-WITH_BF_OPENAL = True
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'wrap_oal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
-WITH_BF_FFMPEG = True
-BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
-BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
-BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
-
-WITH_BF_JACK = False
-BF_JACK = LIBDIR + '/jack'
-BF_JACK_INC = '${BF_JACK}/include'
-BF_JACK_LIB = 'libjack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = False
-BF_SNDFILE = LIBDIR + '/sndfile'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'libsndfile-1'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = LIBDIR + '/sdl'
-BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL'
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-BF_PTHREADS = LIBDIR + '/pthreads'
-BF_PTHREADS_INC = '${BF_PTHREADS}/include'
-BF_PTHREADS_LIB = 'pthreadGC2'
-BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Imath IlmThread Iex'
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = LIBDIR + '/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'liblibjpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-WITH_BF_TIFF = True
-BF_TIFF = LIBDIR + '/tiff'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = LIBDIR + '/zlib'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
-BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = LIBDIR + '/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'intl'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/fftw3'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_WINTAB = LIBDIR + '/wintab'
-BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-
-BF_FREETYPE = LIBDIR + '/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = False
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_REDCODE = False
-BF_REDCODE_INC = '#extern'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = 'C:\\MingW'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
-BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
-             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
-             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
-
-WITH_BF_COLLADA = True
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-
-BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-
-#Cycles
-WITH_BF_CYCLES = True 
-
-WITH_BF_OIIO = True
-BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = BF_OIIO + '/include'
-BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = BF_OIIO + '/lib'
-
-WITH_BF_OCIO = True
-BF_OCIO = LIBDIR + '/opencolorio'
-BF_OCIO_INC = BF_OCIO + '/include'
-BF_OCIO_LIB = 'OpenColorIO'
-BF_OCIO_LIBPATH = BF_OCIO + '/lib'
-
-WITH_BF_BOOST = True
-BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_49 boost_filesystem-mgw46-mt-s-1_49 boost_regex-mgw46-mt-s-1_49 boost_system-mgw46-mt-s-1_49 boost_thread-mgw46-mt-s-1_49'
-BF_BOOST_LIBPATH = BF_BOOST + '/lib'
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
-
-#CUDA
-WITH_BF_CYCLES_CUDA_BINARIES = False
-#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-
-##
-CC = 'gcc'
-CXX = 'g++'
-
-CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-CXXFLAGS = []
-
-CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG',  '-O2']
-
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
-
-CC_WARN = [ '-Wall' ]
-
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32', '-lpsapi']
-
-PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
-
-## DISABLED, causes linking errors!
-## for re-distribution, so users dont need mingw installed
-# PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
-
-BF_PROFILE_CCFLAGS = ['-pg', '-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS
-BF_PROFILE = False
-
-BF_BUILDDIR = '..\\build\\win32-mingw'
-BF_INSTALLDIR='..\\install\\win32-mingw'
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -1,223 +0,0 @@
-LCGDIR = '#../lib/windows'
-LIBDIR = '${LCGDIR}'
-
-WITH_BF_FFMPEG = True
-BF_FFMPEG = LIBDIR +'/ffmpeg'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
-
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python32'
-BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-
-WITH_BF_OPENAL = True
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + '/iconv'
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_JACK = False
-BF_JACK = LIBDIR + '/jack'
-BF_JACK_INC = '${BF_JACK}/include ${BF_FFMPEG}/include/msvc'
-BF_JACK_LIB = 'libjack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = LIBDIR + '/sndfile'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'libsndfile-1'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = LIBDIR + '/sdl'
-BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL.lib'
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-BF_PTHREADS = LIBDIR + '/pthreads'
-BF_PTHREADS_INC = '${BF_PTHREADS}/include'
-BF_PTHREADS_LIB = 'pthreadVC2'
-BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
-BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = LIBDIR + '/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-WITH_BF_TIFF = True
-BF_TIFF = LIBDIR + '/tiff'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'libtiff'
-BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = LIBDIR + '/zlib'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
-BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = LIBDIR + '/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gnu_gettext'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-WITH_BF_ELTOPO = False
-BF_LAPACK = LIBDIR + '/lapack'
-BF_LAPACK_LIB = 'libf2c clapack_nowrap BLAS_nowrap'
-BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
-
-BF_WINTAB = LIBDIR + '/wintab'
-BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-
-WITH_BF_BINRELOC = False
-
-BF_WITH_FREETYPE = True
-BF_FREETYPE = LIBDIR + '/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype2ST'
-BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = LIBDIR + '/QTDevWin'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
-BF_QUICKTIME_LIB = 'qtmlClient'
-BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
-
-WITH_BF_OPENJPEG = True 
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/fftw3'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'libfftw'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_REDCODE = False  
-BF_REDCODE_INC = '#extern'
-
-WITH_BF_COLLADA = True
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-
-BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-
-WITH_BF_3DMOUSE = True
-
-WITH_BF_OPENMP = True
-
-#Cycles
-WITH_BF_CYCLES = True 
-
-WITH_BF_OIIO = True
-BF_OIIO = '${LIBDIR}/openimageio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_OCIO = True
-BF_OCIO = '${LIBDIR}/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-BF_BOOST = '${LIBDIR}/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-#CUDA
-WITH_BF_CYCLES_CUDA_BINARIES = False
-#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
-
-WITH_BF_STATICOPENGL = False
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
-BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
-                         '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
-                         '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
-                         
-CC = 'cl.exe'
-CXX = 'cl.exe'
-
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
-CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
-
-BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
-
-CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2', '-DNDEBUG']
-
-C_WARN = []
-CC_WARN = []
-CXX_WARN = []
-
-LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
-
-# # Todo
-# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
-# BF_PROFILE_LINKFLAGS = ['-pg']
-# BF_PROFILE = False
-
-BF_BSC=False
-
-BF_BUILDDIR = '..\\build\\win32-vc'
-BF_INSTALLDIR='..\\install\\win32-vc'
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -1,214 +0,0 @@
-LCGDIR = '#../lib/mingw64'
-LIBDIR = "${LCGDIR}"
-
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
-WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
-BF_PYTHON_DLL = 'python32'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-
-WITH_BF_OPENAL = True
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'wrap_oal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
-WITH_BF_FFMPEG = True
-BF_FFMPEG_LIB = 'avformat.dll avcodec.dll avdevice.dll avutil.dll swscale.dll swresample.dll'
-BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
-BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll ${BF_FFMPEG_LIBPATH}/swresample-0.dll ${BF_FFMPEG_LIBPATH}/xvidcore.dll'
-
-WITH_BF_JACK = False
-BF_JACK = LIBDIR + '/jack'
-BF_JACK_INC = '${BF_JACK}/include'
-BF_JACK_LIB = 'libjack'
-BF_JACK_LIBPATH = '${BF_JACK}/lib'
-
-WITH_BF_SNDFILE = False
-BF_SNDFILE = LIBDIR + '/sndfile'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'libsndfile-1'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = LIBDIR + '/sdl'
-BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL'
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-BF_PTHREADS = '' # Part of MinGW-w64
-BF_PTHREADS_INC = ''
-BF_PTHREADS_LIB = ''
-BF_PTHREADS_LIBPATH = ''
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Imath IlmThread Iex'
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = LIBDIR + '/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-WITH_BF_TIFF = True
-BF_TIFF = LIBDIR + '/tiff'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'tiff'
-BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = LIBDIR + '/zlib'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = LIBDIR + '/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'intl'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/fftw3'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'fftw3'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_OCEANSIM = True
-WITH_BF_PLAYER = True
-WITH_BF_LIBMV = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-BF_WINTAB = LIBDIR + '/wintab'
-BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-
-# enable freetype2 support for text objects
-BF_FREETYPE = LIBDIR + '/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2/'
-BF_FREETYPE_LIB = 'freetype'
-BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-
-WITH_BF_QUICKTIME = False
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_REDCODE = False
-BF_REDCODE_INC = '#extern'
-
-# Mesa Libs should go here if your using them as well....
-WITH_BF_STATICOPENGL = False
-BF_OPENGL = 'C:\\MingW'
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
-BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
-             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
-             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
-
-WITH_BF_COLLADA = True
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-
-BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-
-#Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
-BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-
-WITH_BF_OIIO = True
-BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_OCIO = True
-BF_OCIO = LIBDIR + '/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time-mgw47-mt-s-1_49 boost_date_time-mgw47-mt-sd-1_49 boost_filesystem-mgw47-mt-s-1_49 boost_filesystem-mgw47-mt-sd-1_49 boost_regex-mgw47-mt-s-1_49 boost_regex-mgw47-mt-sd-1_49 boost_system-mgw47-mt-s-1_49 boost_system-mgw47-mt-sd-1_49 boost_thread-mgw47-mt-s-1_49 boost_thread-mgw47-mt-sd-1_49'
-BF_BOOST_LIBPATH = BF_BOOST + '/lib'
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
-
-#May produce errors with unsupported MinGW-w64 builds
-WITH_BF_OPENMP = False
-
-##
-CC = 'gcc'
-CXX = 'g++'
-
-CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-CXXFLAGS = [ '-fpermissive' ]
-
-CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize']
-
-C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
-
-CC_WARN = [ '-Wall' ]
-
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32', '-lpsapi', '-lpthread']
-
-PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
-
-## DISABLED, causes linking errors!
-## for re-distribution, so users dont need mingw installed
-# PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
-
-BF_DEBUG = False
-BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
-
-BF_PROFILE_CCFLAGS = ['-pg', '-g']
-BF_PROFILE_LINKFLAGS = ['-pg']
-BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS
-BF_PROFILE = False
-
-BF_BUILDDIR = '..\\build\\win64-mingw'
-BF_INSTALLDIR='..\\install\\win64-mingw'
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -1,216 +0,0 @@
-LCGDIR = '#../lib/win64'
-LIBDIR = '${LCGDIR}'
-
-WITH_BF_FFMPEG = True
-BF_FFMPEG = LIBDIR +'/ffmpeg'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
-
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python32'
-BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-
-WITH_BF_OPENAL = True
-BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-
-WITH_BF_SNDFILE = True
-BF_SNDFILE = LIBDIR + '/sndfile'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'libsndfile-1'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-
-WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + '/iconv'
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_SDL = True
-BF_SDL = LIBDIR + '/sdl'
-BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL.lib'
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-WITH_BF_JACK = False
-
-BF_PTHREADS = LIBDIR + '/pthreads'
-BF_PTHREADS_INC = '${BF_PTHREADS}/include'
-BF_PTHREADS_LIB = 'pthreadVC2'
-BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
-
-WITH_BF_OPENEXR = True
-WITH_BF_STATICOPENEXR = False
-BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
-BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-
-WITH_BF_DDS = True
-
-WITH_BF_JPEG = True
-BF_JPEG = LIBDIR + '/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-WITH_BF_TIFF = True
-BF_TIFF = LIBDIR + '/tiff'
-BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'libtiff'
-BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
-
-WITH_BF_ZLIB = True
-BF_ZLIB = LIBDIR + '/zlib'
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz'
-BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-
-WITH_BF_INTERNATIONAL = True
-
-BF_GETTEXT = LIBDIR + '/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gnu_gettext'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
-WITH_BF_OCEANSIM = True
-
-WITH_BF_BULLET = True
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-WITH_BF_ELTOPO = False
-BF_LAPACK = LIBDIR + '/lapack'
-BF_LAPACK_LIB = 'libf2c clapack_nowrap BLAS_nowrap'
-BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
-
-BF_WINTAB = LIBDIR + '/wintab'
-BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-
-WITH_BF_BINRELOC = False
-
-BF_WITH_FREETYPE = True
-BF_FREETYPE = LIBDIR + '/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype2ST'
-BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-
-WITH_BF_QUICKTIME = False
-BF_QUICKTIME = LIBDIR + '/QTDevWin'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
-BF_QUICKTIME_LIB = 'qtmlClient'
-BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
-
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_FFTW3 = True
-BF_FFTW3 = LIBDIR + '/fftw3'
-BF_FFTW3_INC = '${BF_FFTW3}/include'
-BF_FFTW3_LIB = 'libfftw'
-BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-
-WITH_BF_REDCODE = False  
-BF_REDCODE_INC = '#extern'
-
-WITH_BF_COLLADA = True
-BF_COLLADA = '#source/blender/collada'
-BF_COLLADA_INC = '${BF_COLLADA}'
-BF_COLLADA_LIB = 'bf_collada'
-
-BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-
-WITH_BF_3DMOUSE = True
-
-WITH_BF_OPENMP = True
-
-#Cycles
-WITH_BF_CYCLES = True
-
-WITH_BF_OIIO = True
-BF_OIIO = '${LIBDIR}/openimageio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_OCIO = True
-BF_OCIO = '${LIBDIR}/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-BF_BOOST = '${LIBDIR}/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-#CUDA
-WITH_BF_CYCLES_CUDA_BINARIES = False
-#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-
-#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-# No need to manually specify SSE/SSE2 on x64 systems.
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
-
-WITH_BF_STATICOPENGL = False
-BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
-BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
-                         '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
-                         '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
-CC = 'cl.exe'
-CXX = 'cl.exe'
-
-CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
-CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
-
-BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
-
-CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2', '-DNDEBUG']
-
-C_WARN = []
-CC_WARN = []
-CXX_WARN = []
-
-LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
-
-BF_BUILDDIR = '..\\build\\win64-vc'
-BF_INSTALLDIR='..\\install\\win64-vc'
-
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -1,924 +0,0 @@
-#!/usr/bin/env python
-
-"""
-tools.BlenderEnvironment
-
-This environment builds on SCons.Script.SConscript.SConsEnvironment
-
-* library repository
-* custom printout
-* wrapper functions
-
-TODO: clean up and sanitise code - crosscheck with btools and SConstruct
-to kill any code duplication
-
-"""
-
-import os
-import os.path
-import string
-import glob
-import time
-import sys
-import tarfile
-import shutil
-import cStringIO
-import platform
-
-from SCons.Script.SConscript import SConsEnvironment
-import SCons.Action
-import SCons.Util
-import SCons.Builder
-import SCons.Tool
-import bcolors
-bc = bcolors.bcolors()
-import btools
-VERSION = btools.VERSION
-VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
-
-Split = SCons.Util.Split
-Action = SCons.Action.Action
-Builder = SCons.Builder.Builder
-GetBuildPath = SConsEnvironment.GetBuildPath
-
-# a few globals
-root_build_dir = ''
-doc_build_dir = ''
-quickie = None # Anything else than None if BF_QUICK has been passed
-quicklist = [] # The list of libraries/programs to compile during a quickie
-program_list = [] # A list holding Nodes to final binaries, used to create installs
-arguments = None
-targets = None
-resources = []
-bitness = 0
-
-#some internals
-blenderdeps = [] # don't manipulate this one outside this module!
-
-##### LIB STUFF ##########
-
-possible_types = ['core'] # can be set in ie. SConstruct
-libs = {}
-vcp = []
-
-def getresources():
-    return resources
-
-def init_lib_dict():
-    for pt in possible_types:
-        libs[pt] = {}
-
-# helper func for add_lib_to_dict
-def internal_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100):
-    if not libname in dict[libtype]:
-        done = None
-        while not done:
-            if dict[libtype].has_key(priority):
-                priority = priority + 1
-            else:
-                done = True
-        dict[libtype][priority] = libname
-
-# libtype and priority can both be lists, for defining lib in multiple places
-def add_lib_to_dict(env, dict = None, libtype = None, libname = None, priority = 100):
-    if not dict or not libtype or not libname:
-        print "Passed wrong arg"
-        env.Exit()
-
-    if type(libtype) is str and type(priority) is int:
-        internal_lib_to_dict(dict, libtype, libname, priority)
-    elif type(libtype) is list and type(priority) is list:
-        if len(libtype)==len(priority):
-            for lt, p in zip(libtype, priority):
-                internal_lib_to_dict(dict, lt, libname, p)
-        else:
-            print "libtype and priority lists are unequal in length"
-            env.Exit()
-    else:
-        print "Wrong type combinations for libtype and priority. Only str and int or list and list"
-        env.Exit()
-
-def create_blender_liblist(lenv = None, libtype = None):
-    if not lenv or not libtype:
-        print "missing arg"
-
-    lst = []
-    if libtype in possible_types:
-        curlib = libs[libtype]
-        sortlist = curlib.keys()
-        sortlist.sort()
-        for sk in sortlist:
-            v = curlib[sk]
-            if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
-                target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
-            else:
-                target = os.path.abspath(root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
-            lst.append(target)
-
-    return lst
-
-## TODO: static linking
-def setup_staticlibs(lenv):
-    statlibs = [
-        #here libs for static linking
-    ]
-
-    libincs = []
-
-    if lenv['WITH_BF_FFMPEG']:
-        libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
-
-    libincs.extend([
-        lenv['BF_OPENGL_LIBPATH'],
-        lenv['BF_JPEG_LIBPATH'],
-        lenv['BF_ZLIB_LIBPATH'],
-        lenv['BF_PNG_LIBPATH'],
-        lenv['BF_ICONV_LIBPATH']
-        ])
-
-    libincs += Split(lenv['BF_FREETYPE_LIBPATH'])
-    if lenv['WITH_BF_PYTHON']:
-        libincs += Split(lenv['BF_PYTHON_LIBPATH'])
-    if lenv['WITH_BF_SDL']:
-        libincs += Split(lenv['BF_SDL_LIBPATH'])
-    if lenv['WITH_BF_JACK']:
-        libincs += Split(lenv['BF_JACK_LIBPATH'])
-    if lenv['WITH_BF_SNDFILE']:
-        libincs += Split(lenv['BF_SNDFILE_LIBPATH'])
-    if lenv['WITH_BF_OPENEXR']:
-        libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
-        if lenv['WITH_BF_STATICOPENEXR']:
-            statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
-    if lenv['WITH_BF_TIFF']:
-        libincs += Split(lenv['BF_TIFF_LIBPATH'])
-        if lenv['WITH_BF_STATICTIFF']:
-            statlibs += Split(lenv['BF_TIFF_LIB_STATIC'])
-    if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
-        statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
-    if lenv['WITH_BF_FFTW3']:
-        libincs += Split(lenv['BF_FFTW3_LIBPATH'])
-        if lenv['WITH_BF_STATICFFTW3']:
-            statlibs += Split(lenv['BF_FFTW3_LIB_STATIC'])
-    if lenv['WITH_BF_ELTOPO']:
-        libincs += Split(lenv['BF_LAPACK_LIBPATH'])
-        if lenv['WITH_BF_STATICLAPACK']:
-		    statlibs += Split(lenv['BF_LAPACK_LIB_STATIC'])        
-    if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']:
-        statlibs += Split(lenv['BF_FFMPEG_LIB_STATIC'])
-    if lenv['WITH_BF_INTERNATIONAL']:
-        libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
-        if lenv['WITH_BF_GETTEXT_STATIC']:
-            statlibs += Split(lenv['BF_GETTEXT_LIB_STATIC'])
-        if lenv['WITH_BF_FREETYPE_STATIC']:
-            statlibs += Split(lenv['BF_FREETYPE_LIB_STATIC'])
-    if lenv['WITH_BF_OPENAL']:
-        libincs += Split(lenv['BF_OPENAL_LIBPATH'])
-        if lenv['WITH_BF_STATICOPENAL']:
-            statlibs += Split(lenv['BF_OPENAL_LIB_STATIC'])
-    if lenv['WITH_BF_STATICOPENGL']:
-        statlibs += Split(lenv['BF_OPENGL_LIB_STATIC'])
-    if lenv['WITH_BF_STATICCXX']:
-        statlibs += Split(lenv['BF_CXX_LIB_STATIC'])
-
-    if lenv['WITH_BF_PYTHON'] and lenv['WITH_BF_STATICPYTHON']:
-        statlibs += Split(lenv['BF_PYTHON_LIB_STATIC'])
-
-    if lenv['WITH_BF_SNDFILE'] and lenv['WITH_BF_STATICSNDFILE']:
-        statlibs += Split(lenv['BF_SNDFILE_LIB_STATIC'])
-
-    if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-        libincs += Split(lenv['BF_PTHREADS_LIBPATH'])
-
-    if lenv['WITH_BF_COLLADA']:
-        libincs += Split(lenv['BF_OPENCOLLADA_LIBPATH'])
-        if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-            libincs += Split(lenv['BF_PCRE_LIBPATH'])
-            libincs += Split(lenv['BF_EXPAT_LIBPATH'])
-
-    if lenv['WITH_BF_OPENMP']:
-        if lenv['OURPLATFORM'] == 'linuxcross':
-            libincs += Split(lenv['BF_OPENMP_LIBPATH'])
-            
-    if lenv['WITH_BF_OIIO']:
-        libincs += Split(lenv['BF_OIIO_LIBPATH'])
-        if lenv['WITH_BF_STATICOIIO']:
-            statlibs += Split(lenv['BF_OIIO_LIB_STATIC'])
-
-    if lenv['WITH_BF_OCIO']:
-        libincs += Split(lenv['BF_OCIO_LIBPATH'])
-        if lenv['WITH_BF_STATICOCIO']:
-            statlibs += Split(lenv['BF_OCIO_LIB_STATIC'])
-
-    if lenv['WITH_BF_BOOST']:
-        libincs += Split(lenv['BF_BOOST_LIBPATH'])
-        if lenv['WITH_BF_STATICBOOST']:
-            statlibs += Split(lenv['BF_BOOST_LIB_STATIC'])
-
-    # setting this last so any overriding of manually libs could be handled
-    if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross', 'win64-mingw'):
-        libincs.append('/usr/lib')
-
-    if lenv['WITH_BF_JEMALLOC']:
-        libincs += Split(lenv['BF_JEMALLOC_LIBPATH'])
-        if lenv['WITH_BF_STATICJEMALLOC']:
-            statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC'])
-
-    if lenv['OURPLATFORM']=='linux':
-        if lenv['WITH_BF_3DMOUSE']:
-            libincs += Split(lenv['BF_3DMOUSE_LIBPATH'])
-            if lenv['WITH_BF_STATIC3DMOUSE']:
-                statlibs += Split(lenv['BF_3DMOUSE_LIB_STATIC'])
-
-    return statlibs, libincs
-
-def setup_syslibs(lenv):
-    syslibs = []
-
-    if not lenv['WITH_BF_FREETYPE_STATIC']:
-        syslibs += Split(lenv['BF_FREETYPE_LIB'])
-    if lenv['WITH_BF_PYTHON'] and not lenv['WITH_BF_STATICPYTHON']:
-        if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw', 'win64-mingw'):
-            syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
-        else:
-            syslibs.append(lenv['BF_PYTHON_LIB'])
-    if lenv['WITH_BF_INTERNATIONAL'] and not lenv['WITH_BF_GETTEXT_STATIC']:
-        syslibs += Split(lenv['BF_GETTEXT_LIB'])
-    if lenv['WITH_BF_OPENAL']:
-        if not lenv['WITH_BF_STATICOPENAL']:
-            syslibs += Split(lenv['BF_OPENAL_LIB'])
-    if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc':
-        if lenv['CC'] == 'cl.exe':
-            syslibs += ['vcomp']
-        else:
-            syslibs += ['gomp']
-    if lenv['WITH_BF_ICONV']:
-        syslibs += Split(lenv['BF_ICONV_LIB'])
-    if lenv['WITH_BF_OIIO']:
-        if not lenv['WITH_BF_STATICOIIO']:
-            syslibs += Split(lenv['BF_OIIO_LIB'])
-
-    if lenv['WITH_BF_OCIO']:
-        if not lenv['WITH_BF_STATICOCIO']:
-            syslibs += Split(lenv['BF_OCIO_LIB'])
-
-    if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']:
-        syslibs += Split(lenv['BF_OPENEXR_LIB'])
-    if lenv['WITH_BF_TIFF'] and not lenv['WITH_BF_STATICTIFF']:
-        syslibs += Split(lenv['BF_TIFF_LIB'])
-    if lenv['WITH_BF_ZLIB'] and not lenv['WITH_BF_STATICZLIB']:
-        syslibs += Split(lenv['BF_ZLIB_LIB'])
-    if lenv['WITH_BF_FFMPEG'] and not lenv['WITH_BF_STATICFFMPEG']:
-        syslibs += Split(lenv['BF_FFMPEG_LIB'])
-        if lenv['WITH_BF_OGG']:
-            syslibs += Split(lenv['BF_OGG_LIB'])
-    if lenv['WITH_BF_JACK']:
-        syslibs += Split(lenv['BF_JACK_LIB'])
-    if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']:
-        syslibs += Split(lenv['BF_SNDFILE_LIB'])
-    if lenv['WITH_BF_FFTW3'] and not lenv['WITH_BF_STATICFFTW3']:
-        syslibs += Split(lenv['BF_FFTW3_LIB'])
-    if lenv['WITH_BF_ELTOPO']:
-        syslibs += Split(lenv['BF_LAPACK_LIB'])
-    if lenv['WITH_BF_SDL']:
-        syslibs += Split(lenv['BF_SDL_LIB'])
-    if not lenv['WITH_BF_STATICOPENGL']:
-        syslibs += Split(lenv['BF_OPENGL_LIB'])
-    if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'):
-        syslibs += Split(lenv['BF_PTHREADS_LIB'])
-    if lenv['WITH_BF_COLLADA']:
-        syslibs.append(lenv['BF_PCRE_LIB'])
-        if lenv['BF_DEBUG'] and (lenv['OURPLATFORM'] != 'linux'):
-            syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
-        else:
-            syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-        syslibs.append(lenv['BF_EXPAT_LIB'])
-
-    if lenv['WITH_BF_JEMALLOC']:
-        if not lenv['WITH_BF_STATICJEMALLOC']:
-            syslibs += Split(lenv['BF_JEMALLOC_LIB'])
-
-    if lenv['OURPLATFORM']=='linux':
-        if lenv['WITH_BF_3DMOUSE']:
-            if not lenv['WITH_BF_STATIC3DMOUSE']:
-                syslibs += Split(lenv['BF_3DMOUSE_LIB'])
-                
-    if lenv['WITH_BF_BOOST'] and not lenv['WITH_BF_STATICBOOST']:
-        syslibs += Split(lenv['BF_BOOST_LIB'])
-
-    syslibs += Split(lenv['BF_JPEG_LIB'])
-    syslibs += Split(lenv['BF_PNG_LIB'])
-
-    syslibs += lenv['LLIBS']
-
-    return syslibs
-
-def propose_priorities():
-    print bc.OKBLUE+"Priorities:"+bc.ENDC
-    for t in possible_types:
-        print bc.OKGREEN+"\t"+t+bc.ENDC
-        new_priority = 0
-        curlib = libs[t]
-        sortlist = curlib.keys()
-        sortlist.sort()
-
-        for sk in sortlist:
-            v = curlib[sk]
-            #for p,v in sorted(libs[t].iteritems()):
-            print "\t\t",new_priority, v
-            new_priority += 5
-
-# emits the necessary file objects for creator.c, to be used in creating
-# the final blender executable
-def creator(env):
-    sources = ['creator.c']# + Blender.buildinfo(env, "dynamic") + Blender.resources
-
-    incs = ['#/intern/guardedalloc', '#/source/blender/blenlib', '#/source/blender/blenkernel', '#/source/blender/editors/include', '#/source/blender/blenloader', '#/source/blender/imbuf', '#/source/blender/renderconverter', '#/source/blender/render/extern/include', '#/source/blender/windowmanager', '#/source/blender/makesdna', '#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines', '#/extern/glew/include', '#/source/blender/gpu', env['BF_OPENGL_INC']]
-
-    defs = []
-
-    if env['WITH_BF_BINRELOC']:
-        incs.append('#/extern/binreloc/include')
-        defs.append('WITH_BINRELOC')
-
-    if env['WITH_BF_SDL']:
-        defs.append('WITH_SDL')
-
-    if env['WITH_BF_LIBMV']:
-        incs.append('#/extern/libmv')
-        defs.append('WITH_LIBMV')
-
-    if env['WITH_BF_FFMPEG']:
-        defs.append('WITH_FFMPEG')
-
-    if env['WITH_BF_PYTHON']:
-        incs.append('#/source/blender/python')
-        defs.append('WITH_PYTHON')
-        if env['BF_DEBUG']:
-            defs.append('_DEBUG')
-
-    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-        incs.append(env['BF_PTHREADS_INC'])
-        incs.append('#/intern/utfconv')
-
-    env.Append(CPPDEFINES=defs)
-    env.Append(CPPPATH=incs)
-    obj = [env.Object(root_build_dir+'source/creator/creator/creator', ['#source/creator/creator.c'])]
-
-    return obj
-
-## TODO: see if this can be made in an emitter
-def buildinfo(lenv, build_type):
-    """
-    Generate a buildinfo object
-    """
-    build_date = time.strftime ("%Y-%m-%d")
-    build_time = time.strftime ("%H:%M:%S")
-    build_rev = os.popen('svnversion').read()[:-1] # remove \n
-    if build_rev == '': 
-        build_rev = '-UNKNOWN-'
-    if lenv['BF_DEBUG']:
-        build_type = "Debug"
-        build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['BF_DEBUG_CCFLAGS'] + lenv['CPPFLAGS'])
-        build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['CPPFLAGS'])
-    else:
-        build_type = "Release"
-        build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['REL_CFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS'])
-        build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['REL_CXXFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS'])
-
-    build_linkflags = ' '.join(lenv['PLATFORM_LINKFLAGS'])
-
-    obj = []
-    if lenv['BF_BUILDINFO']:
-        lenv.Append (CPPDEFINES = ['BUILD_TIME=\\"%s\\"'%(build_time),
-                                    'BUILD_DATE=\\"%s\\"'%(build_date),
-                                    'BUILD_TYPE=\\"%s\\"'%(build_type),
-                                    'BUILD_REV=\\"%s\\"'%(build_rev),
-                                    'WITH_BUILDINFO',
-                                    'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
-                                    'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
-                                    'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
-                                    'BUILD_LINKFLAGS=\\"%s\\"'%(build_linkflags),
-                                    'BUILD_SYSTEM=\\"SCons\\"'
-                    ])
-
-        lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])
-
-        obj = [lenv.Object (root_build_dir+'source/creator/%s_buildinfo'%build_type, ['#source/creator/buildinfo.c'])]
-
-    return obj
-
-##### END LIB STUFF ############
-
-##### ACTION STUFF #############
-
-def my_print_cmd_line(self, s, target, source, env):
-    sys.stdout.write(' ' * 70 + '\r')
-    sys.stdout.flush()
-    sys.stdout.write(s + "\r")
-    sys.stdout.flush()
-
-def my_compile_print(target, source, env):
-    a = '%s' % (source[0])
-    d, f = os.path.split(a)
-    return bc.OKBLUE+"Compiling"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
-
-def my_moc_print(target, source, env):
-    a = '%s' % (source[0])
-    d, f = os.path.split(a)
-    return bc.OKBLUE+"Creating MOC"+bc.ENDC+ " ==> '"+bc.OKGREEN+"%s" %(f) + "'"+bc.ENDC
-
-def my_linking_print(target, source, env):
-    t = '%s' % (target[0])
-    d, f = os.path.split(t)
-    return bc.OKBLUE+"Linking library"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
-
-def my_program_print(target, source, env):
-    t = '%s' % (target[0])
-    d, f = os.path.split(t)
-    return bc.OKBLUE+"Linking program"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
-
-def msvc_hack(env):
-    static_lib = SCons.Tool.createStaticLibBuilder(env)
-    program = SCons.Tool.createProgBuilder(env)
-    
-    env['BUILDERS']['Library'] = static_lib
-    env['BUILDERS']['StaticLibrary'] = static_lib
-    env['BUILDERS']['Program'] = program
-        
-def set_quiet_output(env):
-    mycaction = Action("$CCCOM", strfunction=my_compile_print)
-    myshcaction = Action("$SHCCCOM", strfunction=my_compile_print)
-    mycppaction = Action("$CXXCOM", strfunction=my_compile_print)
-    myshcppaction = Action("$SHCXXCOM", strfunction=my_compile_print)
-    mylibaction = Action("$ARCOM", strfunction=my_linking_print)
-    mylinkaction = Action("$LINKCOM", strfunction=my_program_print)
-
-    static_ob, shared_ob = SCons.Tool.createObjBuilders(env)
-    static_ob.add_action('.c', mycaction)
-    static_ob.add_action('.cpp', mycppaction)
-    static_ob.add_action('.cc', mycppaction)
-    shared_ob.add_action('.c', myshcaction)
-    shared_ob.add_action('.cc', myshcppaction)
-
-    static_lib = SCons.Builder.Builder(action = mylibaction,
-                                       emitter = '$LIBEMITTER',
-                                       prefix = '$LIBPREFIX',
-                                       suffix = '$LIBSUFFIX',
-                                       src_suffix = '$OBJSUFFIX',
-                                       src_builder = 'StaticObject')
-
-    program = SCons.Builder.Builder(action = mylinkaction,
-                                    emitter = '$PROGEMITTER',
-                                    prefix = '$PROGPREFIX',
-                                    suffix = '$PROGSUFFIX',
-                                    src_suffix = '$OBJSUFFIX',
-                                    src_builder = 'Object',
-                                    target_scanner = SCons.Defaults.ProgScan)
-
-    env['BUILDERS']['Object'] = static_ob
-    env['BUILDERS']['StaticObject'] = static_ob
-    env['BUILDERS']['StaticLibrary'] = static_lib
-    env['BUILDERS']['Library'] = static_lib
-    env['BUILDERS']['Program'] = program
-    if env['BF_LINE_OVERWRITE']:
-        SCons.Action._ActionAction.print_cmd_line = my_print_cmd_line
-
-def untar_pybundle(from_tar,to_dir,exclude_re):
-    tar= tarfile.open(from_tar, mode='r')
-    exclude_re= list(exclude_re) #single re object or list of re objects
-    debug= 0 #list files instead of unpacking
-    good= []
-    if debug: print '\nFiles not being unpacked:\n'
-    for name in tar.getnames():
-        is_bad= 0
-        for r in exclude_re:
-            if r.match(name):
-                is_bad=1
-                if debug: print name
-                break
-        if not is_bad:
-            good.append(tar.getmember(name))
-    if debug:
-        print '\nFiles being unpacked:\n'
-        for g in good:
-            print g
-    else:
-        tar.extractall(to_dir, good)
-
-def my_winpybundle_print(target, source, env):
-    pass
-
-def WinPyBundle(target=None, source=None, env=None):
-    import re
-    py_tar= env.subst( env['LCGDIR'] )
-    if py_tar[0]=='#':
-        py_tar= py_tar[1:]
-    if env['BF_DEBUG']:
-        py_tar+= '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '_d.tar.gz'
-    else:
-        py_tar+= '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '.tar.gz'
-
-    py_target = env.subst( env['BF_INSTALLDIR'] )
-    if py_target[0]=='#':
-        py_target=py_target[1:]
-    py_target = os.path.join(py_target, VERSION, 'python', 'lib')
-    def printexception(func,path,ex):
-        if os.path.exists(path): #do not report if path does not exist. eg on a fresh build.
-            print str(func) + ' failed on ' + str(path)
-    print "Trying to remove existing py bundle."
-    shutil.rmtree(py_target, False, printexception)
-    exclude_re=[re.compile('.*/test'),
-                re.compile('^test'),
-                re.compile('^distutils'),
-                re.compile('^idlelib'),
-                re.compile('^lib2to3'),
-                re.compile('^tkinter'),
-                re.compile('^_tkinter_d.pyd'),
-                re.compile('^turtledemo'),
-                re.compile('^turtle.py'),
-                ]
-
-    print "Unpacking '" + py_tar + "' to '" + py_target + "'"
-    untar_pybundle(py_tar,py_target,exclude_re)
-
-def  my_appit_print(target, source, env):
-    a = '%s' % (target[0])
-    d, f = os.path.split(a)
-    return "making bundle for " + f
-
-def AppIt(target=None, source=None, env=None):
-    import shutil
-    import commands
-    import os.path
-    
-    
-    a = '%s' % (target[0])
-    builddir, b = os.path.split(a)
-    libdir = env['LCGDIR'][1:]
-    osxarch = env['MACOSX_ARCHITECTURE']
-    installdir = env['BF_INSTALLDIR']
-    print("compiled architecture: %s"%(osxarch))
-    print("Installing to %s"%(installdir))
-    # TODO, use tar.
-    python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
-    if env['WITH_OSX_STATICPYTHON']:
-        print("unzipping to app-bundle: %s"%(python_zip))
-    else:
-        print("dynamic build - make sure to have python3.x-framework installed")
-    bldroot = env.Dir('.').abspath
-    binary = env['BINARYKIND']
-     
-    sourcedir = bldroot + '/source/darwin/%s.app'%binary
-    sourceinfo = bldroot + "/source/darwin/%s.app/Contents/Info.plist"%binary
-    targetinfo = installdir +'/' + "%s.app/Contents/Info.plist"%binary
-    cmd = installdir + '/' +'%s.app'%binary
-    
-    if os.path.isdir(cmd):
-        shutil.rmtree(cmd)
-    shutil.copytree(sourcedir, cmd)
-    cmd = "cat %s | sed s/\$\{MACOSX_BUNDLE_SHORT_VERSION_STRING\}/%s/ | "%(sourceinfo,VERSION)
-    cmd += "sed s/\$\{MACOSX_BUNDLE_LONG_VERSION_STRING\}/%s,\ %s/g > %s"%(VERSION,time.strftime("%Y-%b-%d"),targetinfo)
-    commands.getoutput(cmd)
-    cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,installdir, binary, binary)
-    commands.getoutput(cmd)
-    cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(installdir, binary, VERSION)
-    commands.getoutput(cmd)
-    cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
-
-    # blenderplayer doesn't need all the files
-    if binary == 'blender':
-        cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary, VERSION)
-        commands.getoutput(cmd)
-        cmd = 'cp -R %s/release/datafiles/locale %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
-        commands.getoutput(cmd)
-        cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
-        commands.getoutput(cmd)
-        if env['WITH_BF_OCIO']:
-            cmd = 'cp -R %s/release/datafiles/colormanagement %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
-            commands.getoutput(cmd)
-        cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
-        commands.getoutput(cmd)
-
-        if VERSION_RELEASE_CYCLE == "release":
-            cmd = 'rm -rf %s/%s.app/Contents/MacOS/%s/scripts/addons_contrib'%(installdir,binary,VERSION)
-            commands.getoutput(cmd)
-
-        if env['WITH_BF_CYCLES']:
-            croot = '%s/intern/cycles' % (bldroot)
-            cinstalldir = '%s/%s.app/Contents/MacOS/%s/scripts/addons/cycles' % (installdir,binary,VERSION)
-
-            cmd = 'mkdir %s' % (cinstalldir)
-            commands.getoutput(cmd)
-            cmd = 'mkdir %s/kernel' % (cinstalldir)
-            commands.getoutput(cmd)
-            cmd = 'mkdir %s/lib' % (cinstalldir)
-            commands.getoutput(cmd)
-            cmd = 'cp -R %s/blender/addon/*.py %s/' % (croot, cinstalldir)
-            commands.getoutput(cmd)
-            cmd = 'cp -R %s/doc/license %s/license' % (croot, cinstalldir)
-            commands.getoutput(cmd)
-            cmd = 'cp -R %s/kernel/*.h %s/kernel/*.cl %s/kernel/*.cu %s/kernel/' % (croot, croot, croot, cinstalldir)
-            commands.getoutput(cmd)
-            cmd = 'cp -R %s/kernel/svm %s/util/util_color.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, cinstalldir)
-            commands.getoutput(cmd)
-            cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
-            commands.getoutput(cmd)
-
-    if env['WITH_OSX_STATICPYTHON']:
-        cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
-        commands.getoutput(cmd)
-        cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
-        commands.getoutput(cmd)
-
-    cmd = 'chmod +x  %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
-    commands.getoutput(cmd)
-    cmd = 'find %s/%s.app -name .svn -prune -exec rm -rf {} \;'%(installdir, binary)
-    commands.getoutput(cmd)
-    cmd = 'find %s/%s.app -name .DS_Store -exec rm -rf {} \;'%(installdir, binary)
-    commands.getoutput(cmd)
-    cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary)
-    commands.getoutput(cmd)
-    if env['CC'][:-2].endswith('4.6'): # for correct errorhandling with gcc 4.6.x we need the gcc.dylib to link, thus distribute in app-bundle
-        cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
-        commands.getoutput(cmd)
-        instname = env['BF_CXX']
-        cmd = 'cp %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/'%(instname, installdir, binary)
-        commands.getoutput(cmd)
-        cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary)
-        commands.getoutput(cmd)
-        cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib  @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary)
-        commands.getoutput(cmd)
-        cmd = 'rm -rf  %s/set_simulation_threads.app'%(installdir) # first clear omp_num_threads applescript
-        commands.getoutput(cmd)
-        cmd = 'cp -R %s/source/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript
-        commands.getoutput(cmd)
-
-# extract copy system python, be sure to update other build systems
-# when making changes to the files that are copied.
-def my_unixpybundle_print(target, source, env):
-    pass
-
-def UnixPyBundle(target=None, source=None, env=None):
-    # Any Unix except osx
-    #-- VERSION/python/lib/python3.1
-    
-    import commands
-    
-    def run(cmd):
-        print 'Install command:', cmd
-        commands.getoutput(cmd)
-
-    dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
-
-    lib = env['BF_PYTHON_LIBPATH'].split(os.sep)[-1]
-    target_lib = "lib64" if lib == "lib64" else "lib"
-
-    py_src =    env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] )
-    py_target =    env.subst( dir + '/python/' + target_lib + '/python'+env['BF_PYTHON_VERSION'] )
-    
-    # This is a bit weak, but dont install if its been installed before, makes rebuilds quite slow.
-    if os.path.exists(py_target):
-        print 'Using existing python from:'
-        print '\t"%s"' %            py_target
-        print '\t(skipping copy)\n'
-        return
-
-    # Copied from source/creator/CMakeLists.txt, keep in sync.
-    print 'Install python from:'
-    print '\t"%s" into...' % py_src
-    print '\t"%s"\n' % py_target
-
-    run("rm -rf '%s'" % py_target)
-    try:
-        os.makedirs(os.path.dirname(py_target)) # the final part is copied
-    except:
-        pass
-
-    run("cp -R '%s' '%s'" % (py_src, os.path.dirname(py_target)))
-    run("rm -rf '%s/distutils'" % py_target)
-    run("rm -rf '%s/lib2to3'" % py_target)
-    run("rm -rf '%s/config'" % py_target)
-
-    for f in os.listdir(py_target):
-        if f.startswith("config-"):
-            run("rm -rf '%s/%s'" % (py_target, f))
-
-    run("rm -rf '%s/site-packages'" % py_target)
-    run("mkdir '%s/site-packages'" % py_target)    # python needs it.'
-    run("rm -rf '%s/idlelib'" % py_target)
-    run("rm -rf '%s/tkinter'" % py_target)
-    run("rm -rf '%s/turtledemo'" % py_target)
-    run("rm -r '%s/turtle.py'" % py_target)
-    run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target)
-
-    if env['WITH_BF_PYTHON_INSTALL_NUMPY']:
-        numpy_src = py_src + "/site-packages/numpy"
-        numpy_target = py_target + "/site-packages/numpy"
-
-        if os.path.exists(numpy_src):
-            print 'Install numpy from:'
-            print '\t"%s" into...' % numpy_src
-            print '\t"%s"\n' % numpy_target
-
-            run("cp -R '%s' '%s'" % (numpy_src, os.path.dirname(numpy_target)))
-        else:
-            print 'Failed to find numpy at %s, skipping copying' % numpy_src
-
-    run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target)
-    run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target)
-    run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target)
-    run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target)
-
-#### END ACTION STUFF #########
-
-def bsc(env, target, source):
-    
-    bd = os.path.dirname(target[0].abspath)
-    bscfile = '\"'+target[0].abspath+'\"'
-    bscpathcollect = '\"'+bd + os.sep + '*.sbr\"'
-    bscpathtmp = '\"'+bd + os.sep + 'bscmake.tmp\"'
-
-    os.system('dir /b/s '+bscpathcollect+' >'+bscpathtmp)
-
-    myfile = open(bscpathtmp[1:-1], 'r')
-    lines = myfile.readlines()
-    myfile.close()
-
-    newfile = open(bscpathtmp[1:-1], 'w')
-    for l in lines:
-        newfile.write('\"'+l[:-1]+'\"\n')
-    newfile.close()
-                
-    os.system('bscmake /nologo /n /o'+bscfile+' @'+bscpathtmp)
-    os.system('del '+bscpathtmp)
-
-class BlenderEnvironment(SConsEnvironment):
-
-    PyBundleActionAdded = False
-
-    def BlenderRes(self=None, libname=None, source=None, libtype=['core'], priority=[100]):
-        global libs
-        if not self or not libname or not source:
-            print bc.FAIL+'Cannot continue.  Missing argument for BlenderRes '+libname+bc.ENDC
-            self.Exit()
-        if self['OURPLATFORM'] not in ('win32-vc','win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'):
-            print bc.FAIL+'BlenderRes is for windows only!'+bc.END
-            self.Exit()
-        
-        print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
-        lenv = self.Clone()
-        if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
-            res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
-        else:
-            res = lenv.RES(root_build_dir+'lib/'+libname, source)
-
-        
-        SConsEnvironment.Default(self, res)
-        resources.append(res)
-
-    def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None, cc_compilerchange=None, cxx_compilerchange=None):
-        global vcp
-        if not self or not libname or not sources:
-            print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
-            self.Exit()
-
-        def list_substring(quickie, libname):
-            for q in quickie:
-                if libname.find(q) != -1:
-                    return True
-            return False
-
-        if list_substring(quickie, libname) or len(quickie)==0:
-            if list_substring(quickdebug, libname):
-                print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC
-            else:
-                print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC
-            lenv = self.Clone()
-            lenv.Append(CPPPATH=includes)
-            lenv.Append(CPPDEFINES=defines)
-            if lenv['BF_DEBUG'] or (libname in quickdebug):
-                lenv.Append(CFLAGS = lenv['BF_DEBUG_CFLAGS'])
-                lenv.Append(CCFLAGS = lenv['BF_DEBUG_CCFLAGS'])
-                lenv.Append(CXXFLAGS = lenv['BF_DEBUG_CXXFLAGS'])
-            else:
-                lenv.Append(CFLAGS = lenv['REL_CFLAGS'])
-                lenv.Append(CCFLAGS = lenv['REL_CCFLAGS'])
-                lenv.Append(CXXFLAGS = lenv['REL_CXXFLAGS'])
-            if lenv['BF_PROFILE']:
-                lenv.Append(CFLAGS = lenv['BF_PROFILE_CFLAGS'])
-                lenv.Append(CCFLAGS = lenv['BF_PROFILE_CCFLAGS'])
-                lenv.Append(CXXFLAGS = lenv['BF_PROFILE_CXXFLAGS'])
-            if compileflags:
-                lenv.Replace(CFLAGS = compileflags)
-            if cc_compileflags:
-                lenv.Replace(CCFLAGS = cc_compileflags)
-            if cxx_compileflags:
-                lenv.Replace(CXXFLAGS = cxx_compileflags)
-            if cc_compilerchange:
-                lenv.Replace(CC = cc_compilerchange)
-            if cxx_compilerchange:
-                lenv.Replace(CXX = cxx_compilerchange)
-            lenv.Append(CFLAGS = lenv['C_WARN'])
-            lenv.Append(CCFLAGS = lenv['CC_WARN'])
-            lenv.Append(CXXFLAGS = lenv['CXX_WARN'])
-
-            if lenv['OURPLATFORM'] == 'win64-vc':
-                lenv.Append(LINKFLAGS = ['/MACHINE:X64'])
-
-            if lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-                if lenv['BF_DEBUG']:
-                    lenv.Append(CCFLAGS = ['/MTd'])
-                else:
-                    lenv.Append(CCFLAGS = ['/MT'])
-            
-            targetdir = root_build_dir+'lib/' + libname
-            if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
-                targetdir = '#'+targetdir
-            lib = lenv.Library(target= targetdir, source=sources)
-            SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build
-            if self['BF_MSVS'] and self['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-                #if targetdir[0] == '#':
-                #    targetdir = targetdir[1:-1]
-                print "! ",targetdir+ '.vcproj' # + self['MSVSPROJECTSUFFIX']
-                vcproject = self.MSVSProject(target = targetdir + '.vcproj', # + self['MSVSPROJECTSUFFIX'],
-                         srcs = sources,
-                         buildtarget = lib,
-                         variant = 'Release',
-                         auto_build_solution=0)
-                vcp.append(vcproject)
-                SConsEnvironment.Default(self, vcproject)
-        else:
-            print bc.WARNING+'Not building '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC+' for '+bc.OKBLUE+'BF_QUICK'+bc.ENDC
-        # note: libs is a global
-        add_lib_to_dict(self, libs, libtype, libname, priority)
-
-    def BlenderProg(self=None, builddir=None, progname=None, sources=None, libs=None, libpath=None, binarykind=''):
-        global vcp
-        print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
-        lenv = self.Clone()
-        lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
-        if lenv['OURPLATFORM'] in ('win32-mingw', 'win64-mingw', 'linuxcross', 'cygwin', 'linux'):
-            lenv.Replace(LINK = '$CXX')
-        if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
-            if lenv['BF_DEBUG']:
-                lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
-        if  lenv['OURPLATFORM']=='linux':
-            if lenv['WITH_BF_PYTHON']:
-                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
-        if  lenv['OURPLATFORM']=='sunos5':
-            if lenv['WITH_BF_PYTHON']:
-                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
-            if lenv['CXX'].endswith('CC'):
-                lenv.Replace(LINK = '$CXX')
-        if  lenv['OURPLATFORM']=='darwin':
-            if lenv['WITH_BF_PYTHON']:
-                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
-            lenv.Append(LINKFLAGS = lenv['BF_OPENGL_LINKFLAGS'])
-        if lenv['BF_PROFILE']:
-            lenv.Append(LINKFLAGS = lenv['BF_PROFILE_LINKFLAGS'])
-        if root_build_dir[0]==os.sep or root_build_dir[1]==':':
-            lenv.Append(LIBPATH=root_build_dir + '/lib')
-        lenv.Append(LIBPATH=libpath)
-        lenv.Append(LIBS=libs)
-        if lenv['WITH_BF_QUICKTIME']:
-            lenv.Append(LIBS = lenv['BF_QUICKTIME_LIB'])
-            lenv.Append(LIBPATH = lenv['BF_QUICKTIME_LIBPATH'])
-        prog = lenv.Program(target=builddir+'bin/'+progname, source=sources)
-        if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc') and lenv['BF_BSC']:
-            f = lenv.File(progname + '.bsc', builddir)
-            brs = lenv.Command(f, prog, [bsc])
-            SConsEnvironment.Default(self, brs)
-        SConsEnvironment.Default(self, prog)
-        if self['BF_MSVS'] and self['OURPLATFORM'] in ('win32-vc', 'win64-vc') and progname == 'blender':
-            print "! ",builddir + "/" + progname + '.sln'
-            sln = self.MSVSProject(target = builddir + "/" + progname + '.sln',
-                     projects= vcp,
-                     variant = 'Release')
-            SConsEnvironment.Default(self, sln)
-        program_list.append(prog)
-        if  lenv['OURPLATFORM']=='darwin':
-            lenv['BINARYKIND'] = binarykind
-            lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
-        elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation)
-            if lenv['WITH_BF_PYTHON']:
-                if (not lenv['WITHOUT_BF_INSTALL'] and 
-                    not lenv['WITHOUT_BF_PYTHON_INSTALL'] and 
-                    not lenv['WITHOUT_BF_PYTHON_UNPACK'] and 
-                    not BlenderEnvironment.PyBundleActionAdded):
-                    lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print))
-                    BlenderEnvironment.PyBundleActionAdded = True
-        elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation
-            if lenv['WITH_BF_PYTHON']:
-                if (not lenv['WITHOUT_BF_PYTHON_INSTALL'] and 
-                    not lenv['WITHOUT_BF_PYTHON_UNPACK'] and 
-                    not BlenderEnvironment.PyBundleActionAdded):
-                    lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print))
-                    BlenderEnvironment.PyBundleActionAdded = True
-        return prog
-
-    def Glob(lenv, pattern):
-        path = string.replace(GetBuildPath(lenv,'SConscript'),'SConscript', '')
-        files = []
-        for i in glob.glob(path + pattern):
-            files.append(string.replace(i, path, ''))
-        return files
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -1,821 +0,0 @@
-import os
-import os.path
-import SCons.Options
-
-import SCons.Variables
-try:
-    import subprocess
-except ImportError:
-    pass
-import string
-import glob
-import shutil
-import sys
-
-Variables = SCons.Variables
-BoolVariable = SCons.Variables.BoolVariable
-
-def get_version():
-    import re
-
-    fname = os.path.join(os.path.dirname(__file__), "..", "..", "..", "source", "blender", "blenkernel", "BKE_blender.h")
-    ver_base = None
-    ver_char = None
-    ver_cycle = None
-
-    re_ver = re.compile("^#\s*define\s+BLENDER_VERSION\s+([0-9]+)")
-    re_ver_char = re.compile("^#\s*define\s+BLENDER_VERSION_CHAR\s*(\S*)") # optional arg
-    re_ver_cycle = re.compile("^#\s*define\s+BLENDER_VERSION_CYCLE\s*(\S*)") # optional arg
-
-    for l in open(fname, "r"):
-        match = re_ver.match(l)
-        if match:
-            ver = int(match.group(1))
-            ver_base = "%d.%d" % (ver / 100, ver % 100)
-
-        match = re_ver_char.match(l)
-        if match:
-            ver_char = match.group(1)
-            if ver_char == "BLENDER_CHAR_VERSION":
-                ver_char = ""
-
-        match = re_ver_cycle.match(l)
-        if match:
-            ver_cycle = match.group(1)
-            if ver_cycle == "BLENDER_CYCLE_VERSION":
-                ver_cycle = ""
-
-        if (ver_base is not None) and (ver_char is not None) and (ver_cycle is not None):
-            # eg '2.56a-beta'
-            if ver_cycle:
-                ver_display = "%s%s-%s" % (ver_base, ver_char, ver_cycle)
-            else:
-                ver_display = "%s%s" % (ver_base, ver_char)  # assume release
-
-            return ver_base, ver_display, ver_cycle
-
-    raise Exception("%s: missing version string" % fname)
-
-def get_revision():
-    build_rev = os.popen('svnversion').read()[:-1] # remove \n
-    if build_rev == '' or build_rev==None: 
-        build_rev = 'UNKNOWN'
-
-    return 'r' + build_rev
-
-
-# copied from: http://www.scons.org/wiki/AutoconfRecipes
-def checkEndian():
-    import struct
-    array = struct.pack('cccc', '\x01', '\x02', '\x03', '\x04')
-    i = struct.unpack('i', array)
-    # Little Endian
-    if i == struct.unpack('<i', array):
-        return "little"
-    # Big Endian
-    elif i == struct.unpack('>i', array):
-        return "big"
-    else:
-        raise Exception("cant find endian")
-
-
-# This is used in creating the local config directories
-VERSION, VERSION_DISPLAY, VERSION_RELEASE_CYCLE = get_version()
-REVISION = get_revision()
-ENDIAN = checkEndian()
-
-
-def print_arguments(args, bc):
-    if len(args):
-        for k,v in args.iteritems():
-            if type(v)==list:
-                v = ' '.join(v)
-            print '\t'+bc.OKBLUE+k+bc.ENDC+' = '+bc.OKGREEN + v + bc.ENDC
-    else:
-        print '\t'+bc.WARNING+'No  command-line arguments given'+bc.ENDC
-
-def validate_arguments(args, bc):
-    opts_list = [
-            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 
-            'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
-            'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
-            'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
-            'WITH_BF_SNDFILE', 'BF_SNDFILE', 'BF_SNDFILE_INC', 'BF_SNDFILE_LIB', 'BF_SNDFILE_LIBPATH', 'WITH_BF_STATICSNDFILE', 'BF_SNDFILE_LIB_STATIC',
-            'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH',
-            'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC',
-            'WITH_BF_DDS', 'WITH_BF_CINEON', 'WITH_BF_HDR',
-            'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG',  'BF_FFMPEG_INC', 'BF_FFMPEG_DLL',
-            'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
-            'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
-            'WITH_BF_FRAMESERVER',
-            'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY',
-            'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
-            'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
-            'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
-            'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH',
-            'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', 'WITH_BF_STATICTIFF', 'BF_TIFF_LIB_STATIC',
-            'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', 'WITH_BF_STATICZLIB', 'BF_ZLIB_LIB_STATIC',
-            'WITH_BF_INTERNATIONAL',
-            'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
-            'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
-            'WITH_BF_GAMEENGINE',
-            'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
-            'WITH_BF_ELTOPO', 'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
-            'BF_WINTAB', 'BF_WINTAB_INC',
-            'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
-            'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
-            'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
-            'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
-            'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
-            'WITH_BF_PLAYER',
-            'WITH_BF_NOBLENDER',
-            'WITH_BF_BINRELOC',
-            'WITH_BF_LZO', 'WITH_BF_LZMA',
-            'LCGDIR',
-            'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
-            'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
-            'WITHOUT_BF_INSTALL',
-            'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK', 'WITH_BF_PYTHON_INSTALL_NUMPY'
-            'WITHOUT_BF_OVERWRITE_INSTALL',
-            'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
-            'WITH_GHOST_COCOA',
-            'WITH_GHOST_SDL',
-            'WITH_GHOST_XDND',
-            'BF_GHOST_DEBUG',
-            'USE_QTKIT',
-            'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
-            'BF_X264_CONFIG',
-            'BF_XVIDCORE_CONFIG',
-            'WITH_BF_DOCS',
-            'BF_NUMJOBS',
-            'BF_MSVS',
-            'WITH_BF_RAYOPTIMIZATION',
-            'BF_RAYOPTIMIZATION_SSE_FLAGS',
-            'WITH_BF_FLUID',
-            'WITH_BF_DECIMATE',
-            'WITH_BF_BOOLEAN',
-            'WITH_BF_REMESH',
-            'WITH_BF_OCEANSIM',
-            'WITH_BF_SMOKE',
-            'WITH_BF_CXX_GUARDEDALLOC',
-            'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
-            'BUILDBOT_BRANCH',
-            'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
-            'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
-            'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
-            'WITH_BF_OCIO', 'WITH_BF_STATICOCIO', 'BF_OCIO', 'BF_OCIO_INC', 'BF_OCIO_LIB', 'BF_OCIO_LIB_STATIC', 'BF_OCIO_LIBPATH',
-            'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
-            'WITH_BF_LIBMV'
-            ]
-    
-    # Have options here that scons expects to be lists
-    opts_list_split = [
-            'BF_PYTHON_LINKFLAGS',
-            'BF_OPENGL_LINKFLAGS',
-            'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
-            'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
-            'BGE_CXXFLAGS',
-            'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS', 'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS',
-            'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
-            'C_WARN', 'CC_WARN', 'CXX_WARN',
-            'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 'MACOSX_SDK_CHECK', 'XCODE_CUR_VER',
-            'BF_CYCLES_CUDA_BINARIES_ARCH',
-    ]
-    
-    
-    arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
-            'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
-            'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_LINE_OVERWRITE',
-            'BF_BSC', 'BF_CONFIG',
-            'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG',
-            'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG',
-            'BF_UNIT_TEST', 'BF_BITNESS']
-
-    okdict = {}
-
-    for k,v in args.iteritems():
-        if (k in opts_list) or (k in arg_list):
-            okdict[k] = v
-        elif k in opts_list_split:
-            okdict[k] = v.split() # "" have already been stripped
-        else:
-            print '\t'+bc.WARNING+'Invalid argument: '+bc.ENDC+k+'='+v
-
-    return okdict
-
-def print_targets(targs, bc):
-    if len(targs)>0:
-        for t in targs:
-            print '\t'+bc.OKBLUE+t+bc.ENDC
-    else:
-        print '\t'+bc.WARNING+'No targets given, using '+bc.ENDC+bc.OKGREEN+'default'+bc.ENDC
-
-def validate_targets(targs, bc):
-    valid_list = ['.', 'blender', 'blenderstatic', 'blenderplayer', 'webplugin',
-            'blendernogame', 'blenderstaticnogame', 'blenderlite', 'release',
-            'everything', 'clean', 'install-bin', 'install', 'nsis','buildslave']
-    oklist = []
-    for t in targs:
-        if t in valid_list:
-            oklist.append(t)
-        else:
-            print '\t'+bc.WARNING+'Invalid target: '+bc.ENDC+t
-    return oklist
-
-class ourSpawn:
-    def ourspawn(self, sh, escape, cmd, args, env):
-        newargs = string.join(args[1:], ' ')
-        cmdline = cmd + " " + newargs
-        startupinfo = subprocess.STARTUPINFO()
-        #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
-        proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False)
-        data, err = proc.communicate()
-        rv = proc.wait()
-        if data:
-            print(data)
-        if err:
-            print(err)
-        return rv
-
-def SetupSpawn( env ):
-    buf = ourSpawn()
-    buf.ourenv = env
-    env['SPAWN'] = buf.ourspawn
-
-
-def read_opts(env, cfg, args):
-    localopts = Variables.Variables(cfg, args)
-    localopts.AddVariables(
-        ('LCGDIR', 'Location of SVN lib dir'),
-        ('LIBDIR', 'Root dir of libs'),
-        (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
-        (BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)),
-        ('BF_PYTHON', 'Base path for python', ''),
-        ('BF_PYTHON_VERSION', 'Python version to use', ''),
-        ('BF_PYTHON_INC', 'Include path for Python headers', ''),
-        ('BF_PYTHON_BINARY', 'Path to the Python interpreter', ''),
-        ('BF_PYTHON_LIB', 'Python library', ''),
-        ('BF_PYTHON_DLL', 'Python dll - used on Windows only', ''),
-        ('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''),
-        ('BF_PYTHON_LIBPATH', 'Library path', ''),
-        ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),
-        (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
-        (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
-        ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
-
-        (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
-        (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
-        (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
-        (BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
-        (BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)),
-        (BoolVariable('WITH_BF_SMOKE', 'Build with smoke simulation', True)),
-        ('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
-        (BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
-        ('BF_OPENAL', 'Base path for OpenAL', ''),
-        ('BF_OPENAL_INC', 'Include path for python headers', ''),
-        ('BF_OPENAL_LIB', 'Path to OpenAL library', ''),
-        ('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''),
-        ('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''),
-        (BoolVariable('WITH_BF_STATICOPENAL', 'Staticly link to openal', False)),
-
-        (BoolVariable('WITH_BF_SDL', 'Use SDL if true', False)),
-        ('BF_SDL', 'SDL base path', ''),
-        ('BF_SDL_INC', 'SDL include path', ''),
-        ('BF_SDL_LIB', 'SDL library', ''),
-        ('BF_SDL_LIBPATH', 'SDL library path', ''),
-
-        (BoolVariable('WITH_BF_JACK', 'Enable jack support if true', True)),
-        ('BF_JACK', 'jack base path', ''),
-        ('BF_JACK_INC', 'jack include path', ''),
-        ('BF_JACK_LIB', 'jack library', ''),
-        ('BF_JACK_LIBPATH', 'jack library path', ''),
-
-        (BoolVariable('WITH_BF_SNDFILE', 'Enable sndfile support if true', True)),
-        ('BF_SNDFILE', 'sndfile base path', ''),
-        ('BF_SNDFILE_INC', 'sndfile include path', ''),
-        ('BF_SNDFILE_LIB', 'sndfile library', ''),
-        ('BF_SNDFILE_LIB_STATIC', 'Path to sndfile static library', ''),
-        ('BF_SNDFILE_LIBPATH', 'sndfile library path', ''),
-        (BoolVariable('WITH_BF_STATICSNDFILE', 'Staticly link to sndfile', False)),
-
-        ('BF_PTHREADS', 'Pthreads base path', ''),
-        ('BF_PTHREADS_INC', 'Pthreads include path', ''),
-        ('BF_PTHREADS_LIB', 'Pthreads library', ''),
-        ('BF_PTHREADS_LIBPATH', 'Pthreads library path', ''),
-
-        (BoolVariable('WITH_BF_OPENEXR', 'Use OPENEXR if true', True)),
-        (BoolVariable('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', False)),
-        ('BF_OPENEXR', 'OPENEXR base path', ''),
-        ('BF_OPENEXR_INC', 'OPENEXR include path', ''),
-        ('BF_OPENEXR_LIB', 'OPENEXR library', ''),
-        ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''),
-        ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''),
-
-        (BoolVariable('WITH_BF_DDS', 'Support DDS image format if true', True)),
-
-        (BoolVariable('WITH_BF_CINEON', 'Support CINEON and DPX image formats if true', True)),
-
-        (BoolVariable('WITH_BF_HDR', 'Support HDR image formats if true', True)),
-        
-        (BoolVariable('WITH_BF_FRAMESERVER', 'Support export to a frameserver', True)),
-
-        (BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)),
-        ('BF_FFMPEG', 'FFMPEG base path', ''),
-        ('BF_FFMPEG_LIB', 'FFMPEG library', ''),
-        ('BF_FFMPEG_DLL', 'FFMPEG dll libraries to be installed', ''),
-        ('BF_FFMPEG_EXTRA', 'FFMPEG flags that must be preserved', ''),
-
-        ('BF_FFMPEG_INC', 'FFMPEG includes', ''),
-        ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''),
-        (BoolVariable('WITH_BF_STATICFFMPEG', 'Use static FFMPEG if true', False)),
-        ('BF_FFMPEG_LIB_STATIC', 'Static FFMPEG libraries', ''),
-        
-        (BoolVariable('WITH_BF_OGG', 'Link OGG, THEORA, VORBIS with FFMPEG if true',
-                    False)),
-        ('BF_OGG', 'OGG base path', ''),
-        ('BF_OGG_LIB', 'OGG library', ''),
-
-        (BoolVariable('WITH_BF_JPEG', 'Use JPEG if true', True)),
-        ('BF_JPEG', 'JPEG base path', ''),
-        ('BF_JPEG_INC', 'JPEG include path', ''),
-        ('BF_JPEG_LIB', 'JPEG library', ''),
-        ('BF_JPEG_LIBPATH', 'JPEG library path', ''),
-
-        (BoolVariable('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', False)),
-        ('BF_OPENJPEG', 'OPENJPEG base path', ''),
-        ('BF_OPENJPEG_INC', 'OPENJPEG include path', ''),
-        ('BF_OPENJPEG_LIB', 'OPENJPEG library', ''),
-        ('BF_OPENJPEG_LIBPATH', 'OPENJPEG library path', ''),
-
-        (BoolVariable('WITH_BF_REDCODE', 'Use REDCODE if true', False)),
-        ('BF_REDCODE', 'REDCODE base path', ''),
-        ('BF_REDCODE_INC', 'REDCODE include path', ''),
-        ('BF_REDCODE_LIB', 'REDCODE library', ''),
-        ('BF_REDCODE_LIBPATH', 'REDCODE library path', ''),
-
-        (BoolVariable('WITH_BF_PNG', 'Use PNG if true', True)),
-        ('BF_PNG', 'PNG base path', ''),
-        ('BF_PNG_INC', 'PNG include path', ''),
-        ('BF_PNG_LIB', 'PNG library', ''),
-        ('BF_PNG_LIBPATH', 'PNG library path', ''),
-
-        (BoolVariable('WITH_BF_TIFF', 'Use TIFF if true', True)),
-        (BoolVariable('WITH_BF_STATICTIFF', 'Staticly link to TIFF', False)),
-        ('BF_TIFF', 'TIFF base path', ''),
-        ('BF_TIFF_INC', 'TIFF include path', ''),
-        ('BF_TIFF_LIB', 'TIFF library', ''),
-        ('BF_TIFF_LIBPATH', 'TIFF library path', ''),
-        ('BF_TIFF_LIB_STATIC', 'TIFF static library', ''),
-
-        (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)),
-        (BoolVariable('WITH_BF_STATICZLIB', 'Staticly link to ZLib', False)),
-        ('BF_ZLIB', 'ZLib base path', ''),
-        ('BF_ZLIB_INC', 'ZLib include path', ''),
-        ('BF_ZLIB_LIB', 'ZLib library', ''),
-        ('BF_ZLIB_LIBPATH', 'ZLib library path', ''),
-        ('BF_ZLIB_LIB_STATIC', 'ZLib static library', ''),
-
-        (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Gettext if true', True)),
-
-        ('BF_GETTEXT', 'gettext base path', ''),
-        ('BF_GETTEXT_INC', 'gettext include path', ''),
-        ('BF_GETTEXT_LIB', 'gettext library', ''),
-        (BoolVariable('WITH_BF_GETTEXT_STATIC', 'Use static gettext library if true', False)),
-        ('BF_GETTEXT_LIB_STATIC', 'static gettext library', ''),
-        ('BF_GETTEXT_LIBPATH', 'gettext library path', ''),
-        
-        (BoolVariable('WITH_BF_ICONV', 'Use iconv if true', True)),
-        ('BF_ICONV', 'iconv base path', ''),
-        ('BF_ICONV_INC', 'iconv include path', ''),
-        ('BF_ICONV_LIB', 'iconv library', ''),
-        ('BF_ICONV_LIBPATH', 'iconv library path', ''),
-        
-        (BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
-
-        (BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
-        
-        (BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),
-        ('BF_LAPACK', 'LAPACK base path', ''),
-        ('BF_LAPACK_LIB', 'LAPACK library', ''),
-        ('BF_LAPACK_LIB_STATIC', 'LAPACK library', ''),
-        ('BF_LAPACK_LIBPATH', 'LAPACK library path', ''),
-        (BoolVariable('WITH_BF_STATICLAPACK', 'Staticly link to LAPACK', False)),
-        
-        ('BF_BULLET', 'Bullet base dir', ''),
-        ('BF_BULLET_INC', 'Bullet include path', ''),
-        ('BF_BULLET_LIB', 'Bullet library', ''),
-        
-        ('BF_WINTAB', 'WinTab base dir', ''),
-        ('BF_WINTAB_INC', 'WinTab include dir', ''),
-        ('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''),
-        (BoolVariable('WITH_BF_STATICCXX', 'static link to stdc++', False)),
-        ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''),
-
-        ('BF_FREETYPE', 'Freetype base path', ''),
-        ('BF_FREETYPE_INC', 'Freetype include path', ''),
-        ('BF_FREETYPE_LIB', 'Freetype library', ''),
-        ('BF_FREETYPE_LIBPATH', 'Freetype library path', ''),
-        (BoolVariable('WITH_BF_FREETYPE_STATIC', 'Use Static Freetype if true', False)),
-        ('BF_FREETYPE_LIB_STATIC', 'Static Freetype library', ''),
-
-        (BoolVariable('WITH_BF_OPENMP', 'Use OpenMP if true', False)),
-        ('BF_OPENMP', 'Base path to OpenMP (used when cross-compiling with older versions of WinGW)', ''),
-        ('BF_OPENMP_INC', 'Path to OpenMP includes (used when cross-compiling with older versions of WinGW)', ''),
-        ('BF_OPENMP_LIBPATH', 'Path to OpenMP libraries (used when cross-compiling with older versions of WinGW)', ''),
-        (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', False)),
-        (BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL for windowing rather then the native APIs', False)),
-        (BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)),
-
-        (BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)),
-        ('BF_QUICKTIME', 'QuickTime base path', ''),
-        ('BF_QUICKTIME_INC', 'QuickTime include path', ''),
-        ('BF_QUICKTIME_LIB', 'QuickTime library', ''),
-        ('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''),
-        
-        (BoolVariable('WITH_BF_FFTW3', 'Use FFTW3 if true', False)),
-        ('BF_FFTW3', 'FFTW3 base path', ''),
-        ('BF_FFTW3_INC', 'FFTW3 include path', ''),
-        ('BF_FFTW3_LIB', 'FFTW3 library', ''),
-        ('BF_FFTW3_LIB_STATIC', 'FFTW3 static libraries', ''),
-        ('BF_FFTW3_LIBPATH', 'FFTW3 library path', ''),
-        (BoolVariable('WITH_BF_STATICFFTW3', 'Staticly link to FFTW3', False)),
-
-        (BoolVariable('WITH_BF_STATICOPENGL', 'Use MESA if true', True)),
-        ('BF_OPENGL', 'OpenGL base path', ''),
-        ('BF_OPENGL_INC', 'OpenGL include path', ''),
-        ('BF_OPENGL_LIB', 'OpenGL libraries', ''),
-        ('BF_OPENGL_LIBPATH', 'OpenGL library path', ''),
-        ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''),
-        ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''),
-
-        (BoolVariable('WITH_BF_COLLADA', 'Build COLLADA import/export module if true', False)),
-        ('BF_COLLADA', 'COLLADA base path', ''),
-        ('BF_COLLADA_INC', 'COLLADA include path', ''),
-        ('BF_COLLADA_LIB', 'COLLADA library', ''),
-        ('BF_OPENCOLLADA', 'OpenCollada base path', ''),
-        ('BF_OPENCOLLADA_INC', 'OpenCollada base include path', ''),
-        ('BF_OPENCOLLADA_LIB', 'OpenCollada library', ''),
-        ('BF_OPENCOLLADA_LIBPATH', 'OpenCollada library path', ''),
-        ('BF_PCRE', 'PCRE base path', ''),
-        ('BF_PCRE_LIB', 'PCRE library', ''),
-        ('BF_PCRE_LIBPATH', 'PCRE library path', ''),
-        ('BF_EXPAT', 'Expat base path', ''),
-        ('BF_EXPAT_LIB', 'Expat library', ''),
-        ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
-        
-        (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
-        (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
-        ('BF_JEMALLOC', 'jemalloc base path', ''),
-        ('BF_JEMALLOC_INC', 'jemalloc include path', ''),
-        ('BF_JEMALLOC_LIB', 'jemalloc library', ''),
-        ('BF_JEMALLOC_LIBPATH', 'jemalloc library path', ''),
-        ('BF_JEMALLOC_LIB_STATIC', 'jemalloc static library', ''),
-
-        (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)),
-        (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
-
-        (BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)),
-        (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)),
-        ('BF_3DMOUSE', '3d mouse library base path', ''),
-        ('BF_3DMOUSE_INC', '3d mouse library include path', ''),
-        ('BF_3DMOUSE_LIB', '3d mouse library', ''),
-        ('BF_3DMOUSE_LIBPATH', '3d mouse library path', ''),
-        ('BF_3DMOUSE_LIB_STATIC', '3d mouse static library', ''),
-
-        ('CFLAGS', 'C only flags', []),
-        ('CCFLAGS', 'Generic C and C++ flags', []),
-        ('CXXFLAGS', 'C++ only flags', []),
-        ('BGE_CXXFLAGS', 'C++ only flags for BGE', []),
-        ('CPPFLAGS', 'Defines', []),
-        ('REL_CFLAGS', 'C only release flags', []),
-        ('REL_CCFLAGS', 'Generic C and C++ release flags', []),
-        ('REL_CXXFLAGS', 'C++ only release flags', []),
-
-        ('C_WARN', 'C warning flags', []),
-        ('CC_WARN', 'Generic C and C++ warning flags', []),
-        ('CXX_WARN', 'C++ only warning flags', []),
-
-        ('LLIBS', 'Platform libs', []),
-        ('PLATFORM_LINKFLAGS', 'Platform linkflags', []),
-        ('MACOSX_ARCHITECTURE', 'python_arch.zip select', ''),
-        ('MACOSX_SDK_CHECK', 'detect available OSX sdk`s', ''),
-        ('XCODE_CUR_VER', 'detect XCode version', ''),
-
-        (BoolVariable('BF_PROFILE', 'Add profiling information if true', False)),
-        ('BF_PROFILE_CFLAGS', 'C only profiling flags', []),
-        ('BF_PROFILE_CCFLAGS', 'C and C++ profiling flags', []),
-        ('BF_PROFILE_CXXFLAGS', 'C++ only profiling flags', []),
-        ('BF_PROFILE_LINKFLAGS', 'Profile linkflags', []),
-
-        (BoolVariable('BF_DEBUG', 'Add debug flags if true', False)),
-        ('BF_DEBUG_CFLAGS', 'C only debug flags', []),
-        ('BF_DEBUG_CCFLAGS', 'C and C++ debug flags', []),
-        ('BF_DEBUG_CXXFLAGS', 'C++ only debug flags', []),
-
-        (BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', False)),
-
-        ('BF_BUILDDIR', 'Build dir', ''),
-        ('BF_INSTALLDIR', 'Installation dir', ''),
-
-        ('CC', 'C compiler to use', env['CC']),
-        ('CXX', 'C++ compiler to use', env['CXX']),
-
-        (BoolVariable('BF_BUILDINFO', 'Buildtime in splash if true', True)),
-
-        (BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)),
-        (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
-        (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
-        (BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
-        (BoolVariable('WITH_BF_PYTHON_INSTALL_NUMPY', 'install Python mumpy module', False)),
-        (BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
-        (BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
-        (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
-        (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
-        (BoolVariable('BF_LINE_OVERWRITE', 'Enable overwriting of compile line in BF_QUIET mode if true', False)),
-        (BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)),
-        
-        (BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)),
-        (BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)),
-        
-        (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
-        
-        (BoolVariable('WITH_BF_COMPOSITOR', 'Enable the tile based nodal compositor', True)),
-
-        ('BF_X264_CONFIG', 'configuration flags for x264', ''),
-        ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
-#        (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)),
-        
-        ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'),
-        ('BF_NUMJOBS', 'Number of build processes to spawn', '1'),
-        ('BF_MSVS', 'Generate MSVS project files and solution', False),
-
-        (BoolVariable('BF_UNIT_TEST', 'Build with unit test support.', False)),
-        
-        (BoolVariable('BF_GHOST_DEBUG', 'Make GHOST print events and info to stdout. (very verbose)', False)),
-        
-        (BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False)),
-        ('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', ''),
-        (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)),
-
-        ('BUILDBOT_BRANCH', 'Buildbot branch name', ''),
-    ) # end of opts.AddOptions()
-
-    localopts.AddVariables(
-        (BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
-        (BoolVariable('WITH_BF_CYCLES_CUDA_BINARIES', 'Build with precompiled CUDA binaries', False)),
-        (BoolVariable('WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'Build several render kernels at once (using BF_NUMJOBS)', False)),
-        ('BF_CYCLES_CUDA_NVCC', 'CUDA nvcc compiler path', ''),
-        ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
-
-        (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
-        (BoolVariable('WITH_BF_STATICOIIO', 'Staticly link to OpenImageIO', False)),
-        ('BF_OIIO', 'OIIO root path', ''),
-        ('BF_OIIO_INC', 'OIIO include path', ''),
-        ('BF_OIIO_LIB', 'OIIO library', ''),
-        ('BF_OIIO_LIBPATH', 'OIIO library path', ''),
-        ('BF_OIIO_LIB_STATIC', 'OIIO static library', ''),
-
-        (BoolVariable('WITH_BF_OCIO', 'Build with OpenColorIO', False)),
-        (BoolVariable('WITH_BF_STATICOCIO', 'Staticly link to OpenColorIO', False)),
-        ('BF_OCIO', 'OCIO root path', ''),
-        ('BF_OCIO_INC', 'OCIO include path', ''),
-        ('BF_OCIO_LIB', 'OCIO library', ''),
-        ('BF_OCIO_LIBPATH', 'OCIO library path', ''),
-        ('BF_OCIO_LIB_STATIC', 'OCIO static library', ''),
-
-        (BoolVariable('WITH_BF_BOOST', 'Build with Boost', False)),
-        (BoolVariable('WITH_BF_STATICBOOST', 'Staticly link to boost', False)),
-        ('BF_BOOST', 'Boost root path', ''),
-        ('BF_BOOST_INC', 'Boost include path', ''),
-        ('BF_BOOST_LIB', 'Boost library', ''),
-        ('BF_BOOST_LIBPATH', 'Boost library path', ''),
-        ('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
-
-        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)),
-        (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', False))
-    ) # end of opts.AddOptions()
-
-    return localopts
-
-def buildbot_zip(src, dest, package_name, extension):
-    import zipfile
-    ln = len(src)+1 # one extra to remove leading os.sep when cleaning root for package_root
-    flist = list()
-
-    # create list of tuples containing file and archive name
-    for root, dirs, files in os.walk(src):
-        package_root = os.path.join(package_name, root[ln:])
-        flist.extend([(os.path.join(root, file), os.path.join(package_root, file)) for file in files])
-
-    if extension == '.zip':
-        package = zipfile.ZipFile(dest, 'w', zipfile.ZIP_DEFLATED)
-        package.comment = package_name + ' is a zip-file containing the Blender software. Visit http://www.blender.org for more information.'
-        for entry in flist:
-            package.write(entry[0], entry[1])
-        package.close()
-    else:
-        import tarfile
-        package = tarfile.open(dest, 'w:bz2')
-        for entry in flist:
-            package.add(entry[0], entry[1], recursive=False)
-        package.close()
-    bb_zip_name = os.path.normpath(src + os.sep + '..' + os.sep + 'buildbot_upload.zip')
-    print("creating %s" % (bb_zip_name))
-    bb_zip = zipfile.ZipFile(bb_zip_name, 'w', zipfile.ZIP_DEFLATED)
-    print("writing %s to %s" % (dest, bb_zip_name))
-    bb_zip.write(dest, os.path.split(dest)[1])
-    bb_zip.close()
-    print("removing unneeded packed file %s (to keep install directory clean)" % (dest))
-    os.remove(dest)
-    print("done.")
-
-def buildslave_print(target, source, env):
-    return "Running buildslave target"
-
-def buildslave(target=None, source=None, env=None):
-    """
-    Builder for buildbot integration. Used by buildslaves of http://builder.blender.org only.
-    """
-
-    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw', 'darwin', 'win64-mingw'):
-        extension = '.zip'
-    else:
-        extension = '.tar.bz2'
-
-    if env['OURPLATFORM'] == 'win32-mingw':
-        platform = 'mingw32'
-    elif env['OURPLATFORM'] == 'win64-mingw':
-        platform = 'mingw64'
-    else:
-        platform = env['OURPLATFORM'].split('-')[0]
-
-    if platform == 'linux':
-        import platform
-
-        bitness = platform.architecture()[0]
-        if bitness == '64bit':
-            platform = 'linux-glibc27-x86_64'
-        elif bitness == '32bit':
-            platform = 'linux-glibc27-i686'
-    if platform == 'darwin':
-        platform = 'OSX-' + env['MACOSX_ARCHITECTURE']
-
-    branch = env['BUILDBOT_BRANCH']
-
-    outdir = os.path.abspath(env['BF_INSTALLDIR'])
-    package_name = 'blender-' + VERSION+'-'+REVISION + '-' + platform
-    if branch != '':
-        package_name = branch + '-' + package_name
-    package_dir = os.path.normpath(outdir + os.sep + '..' + os.sep + package_name)
-    package_archive = os.path.normpath(outdir + os.sep + '..' + os.sep + package_name + extension)
-
-    try:
-        if os.path.exists(package_archive):
-            os.remove(package_archive)
-        if os.path.exists(package_dir):
-            shutil.rmtree(package_dir)
-    except Exception, ex:
-        sys.stderr.write('Failed to clean up old package files: ' + str(ex) + '\n')
-        return 1
-
-    buildbot_zip(outdir, package_archive, package_name, extension)
-
-    return 0
-
-def NSIS_print(target, source, env):
-    return "Creating NSIS installer for Blender"
-
-def NSIS_Installer(target=None, source=None, env=None):
-    print "="*35
-
-    if env['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
-        print "NSIS installer is only available on Windows."
-        Exit()
-    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
-        bitness = '32'
-    elif env['OURPLATFORM'] in ('win64-vc', 'win64-mingw'):
-        bitness = '64'
-
-    start_dir = os.getcwd()
-    rel_dir = os.path.join(start_dir,'release','windows','installer')
-    install_base_dir = start_dir + os.sep
-
-    bf_installdir = os.path.join(os.getcwd(),env['BF_INSTALLDIR'])
-    bf_installdir = os.path.normpath(bf_installdir)
-
-    doneroot = False
-    rootdirconts = []
-    datafiles = ''
-    deldatafiles = ''
-    deldatadirs = ''
-    l = len(bf_installdir)
-    
-    for dp,dn,df in os.walk(bf_installdir):
-        # install
-        if not doneroot:
-            for f in df:
-                rootdirconts.append(os.path.join(dp,f))
-            doneroot = True
-        else:
-            if len(df)>0:
-                dp_tmp = dp[l:]
-                datafiles += "\n" +r'SetOutPath $INSTDIR'+dp[l:]+"\n\n"
-
-                for f in df:
-                    outfile = os.path.join(dp,f)
-                    datafiles += '  File '+outfile + "\n"
-
-        # uninstall
-        deldir = dp[l+1:]
-
-        if len(deldir)>0:
-            deldatadirs = "RMDir $INSTDIR\\" + deldir + "\n" + deldatadirs
-            deldatadirs = "RMDir /r $INSTDIR\\" + deldir + "\\__pycache__\n" + deldatadirs
-
-            for f in df:
-                deldatafiles += 'Delete \"$INSTDIR\\' + os.path.join(deldir, f) + "\"\n"
-
-    #### change to suit install dir ####
-    inst_dir = install_base_dir + env['BF_INSTALLDIR']
-    
-    os.chdir(rel_dir)
-
-    ns = open("00.sconsblender.nsi","r")
-
-    ns_cnt = str(ns.read())
-    ns.close()
-
-    # var replacements
-    ns_cnt = string.replace(ns_cnt, "[DISTDIR]", os.path.normpath(inst_dir+os.sep))
-    ns_cnt = string.replace(ns_cnt, "[VERSION]", VERSION_DISPLAY)
-    ns_cnt = string.replace(ns_cnt, "[SHORTVERSION]", VERSION)
-    ns_cnt = string.replace(ns_cnt, "[RELDIR]", os.path.normpath(rel_dir))
-    ns_cnt = string.replace(ns_cnt, "[BITNESS]", bitness)
-
-    # do root
-    rootlist = []
-    for rootitem in rootdirconts:
-        rootlist.append("File \"" + rootitem + "\"")
-    rootstring = string.join(rootlist, "\n  ")
-    rootstring = rootstring
-    rootstring += "\n\n"
-    ns_cnt = string.replace(ns_cnt, "[ROOTDIRCONTS]", rootstring)
-
-
-    # do delete items
-    delrootlist = []
-    for rootitem in rootdirconts:
-        delrootlist.append("Delete $INSTDIR\\" + rootitem[l+1:])
-    delrootstring = string.join(delrootlist, "\n ")
-    delrootstring += "\n"
-    ns_cnt = string.replace(ns_cnt, "[DELROOTDIRCONTS]", delrootstring)
-
-    ns_cnt = string.replace(ns_cnt, "[DODATAFILES]", datafiles)
-    ns_cnt = string.replace(ns_cnt, "[DELDATAFILES]", deldatafiles)
-    ns_cnt = string.replace(ns_cnt, "[DELDATADIRS]", deldatadirs)
-
-    tmpnsi = os.path.normpath(install_base_dir+os.sep+env['BF_BUILDDIR']+os.sep+"00.blender_tmp.nsi")
-    new_nsis = open(tmpnsi, 'w')
-    new_nsis.write(ns_cnt)
-    new_nsis.close()
-    print "NSIS Installer script created"
-
-    os.chdir(start_dir)
-    print "Launching 'makensis'"
-
-    cmdline = "makensis " + "\""+tmpnsi+"\""
-
-    startupinfo = subprocess.STARTUPINFO()
-    #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
-    proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE, startupinfo=startupinfo, shell = True)
-    data, err = proc.communicate()
-    rv = proc.wait()
-
-    if rv != 0:
-        print
-        print data.strip().split("\n")[-1]
-    return rv
-
-def check_environ():
-    problematic_envvars = ""
-    for i in os.environ:
-        try:
-            os.environ[i].decode('ascii')
-        except UnicodeDecodeError:
-            problematic_envvars = problematic_envvars + "%s = %s\n" % (i, os.environ[i])
-    if len(problematic_envvars)>0:
-        print("================\n\n")
-        print("@@ ABORTING BUILD @@\n")
-        print("PROBLEM DETECTED WITH ENVIRONMENT")
-        print("---------------------------------\n\n")
-        print("A problem with one or more environment variable was found")
-        print("Their value contain non-ascii characters. Check the below")
-        print("list and override them locally to be ASCII-clean by doing")
-        print("'set VARNAME=cleanvalue' on the command-line prior to")
-        print("starting the build process:\n")
-        print(problematic_envvars)
-        return False
-    else:
-        return True
--- a/build_files/scons/tools/crossmingw.py
+++ b/build_files/scons/tools/crossmingw.py
@@ -1,184 +0,0 @@
-"""SCons.Tool.gcc
-
-Tool-specific initialization for MinGW (http://www.mingw.org/)
-
-There normally shouldn't be any need to import this module directly.
-It will usually be imported through the generic SCons.Tool.Tool()
-selection method.
-
-"""
-
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "src/engine/SCons/Tool/mingw.py 4043 2009/02/23 09:06:45 scons"
-
-import os
-import os.path
-import string
-
-import SCons.Action
-import SCons.Builder
-import SCons.Defaults
-import SCons.Tool
-import SCons.Util
-
-# This is what we search for to find mingw:
-prefixes = SCons.Util.Split("""
-    mingw32-
-    i386-mingw32msvc-
-    i486-mingw32msvc-
-    i586-mingw32msvc-
-    i686-mingw32msvc-
-    i686-pc-mingw32-
-""")
-
-def find(env):
-    for prefix in prefixes:
-        # First search in the SCons path and then the OS path:
-        if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
-            return prefix
-
-    return ''
-
-def shlib_generator(target, source, env, for_signature):
-    cmd = SCons.Util.CLVar(['$SHLINK']) 
-
-    dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-    if dll: cmd.extend(['-o', dll])
-
-    cmd.extend(['$SOURCES', '$SHLINKFLAGS', '$_LIBDIRFLAGS', '$_LIBFLAGS'])
-
-    implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX')
-    if implib: cmd.append('-Wl,--out-implib,'+implib.get_string(for_signature))
-
-    def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
-    insert_def = env.subst("$WINDOWS_INSERT_DEF")
-    if not insert_def in ['', '0', 0] and def_target: \
-        cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature))
-
-    return [cmd]
-
-def shlib_emitter(target, source, env):
-    dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-    no_import_lib = env.get('no_import_lib', 0)
-
-    if not dll:
-        raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")
-
-    if not no_import_lib and \
-       not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'):
-
-        # Append an import library to the list of targets.
-        target.append(env.ReplaceIxes(dll,  
-                                      'SHLIBPREFIX', 'SHLIBSUFFIX',
-                                      'LIBPREFIX', 'LIBSUFFIX'))
-
-    # Append a def file target if there isn't already a def file target
-    # or a def file source. There is no option to disable def file
-    # target emitting, because I can't figure out why someone would ever
-    # want to turn it off.
-    def_source = env.FindIxes(source, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
-    def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
-    if not def_source and not def_target:
-        target.append(env.ReplaceIxes(dll,  
-                                      'SHLIBPREFIX', 'SHLIBSUFFIX',
-                                      'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX'))
-
-    return (target, source)
-
-
-shlib_action = SCons.Action.Action(shlib_generator, generator=1)
-
-res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
-
-res_builder = SCons.Builder.Builder(action=res_action, suffix='.o',
-                                    source_scanner=SCons.Tool.SourceFileScanner)
-SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan)
-
-def generate(env):
-    mingw = find(env)
-    if mingw:
-        dir = os.path.dirname(mingw)
-        env.PrependENVPath('PATH', dir )
-        
-
-    # Most of mingw is the same as gcc and friends...
-    gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas', 'm4']
-    for tool in gnu_tools:
-        SCons.Tool.Tool(tool)(env)
-
-    #... but a few things differ:
-    env['CC'] = mingw + 'gcc'
-    env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
-    env['CXX'] = mingw + 'g++'
-    env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-    env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
-    env['SHLINKCOM']   = shlib_action
-    env['LDMODULECOM'] = shlib_action
-    env.Append(SHLIBEMITTER = [shlib_emitter])
-    env['RANLIB'] = mingw + 'ranlib'
-    env['LINK'] = mingw + 'gcc'
-    env['AS'] = mingw + 'as'
-    env['AR'] = mingw + 'ar'
-
-    env['WIN32DEFPREFIX']        = ''
-    env['WIN32DEFSUFFIX']        = '.def'
-    env['WINDOWSDEFPREFIX']      = '${WIN32DEFPREFIX}'
-    env['WINDOWSDEFSUFFIX']      = '${WIN32DEFSUFFIX}'
-
-    env['SHOBJSUFFIX'] = '.o'
-    env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
-
-    env['RC'] = mingw + 'windres'
-    env['RCFLAGS'] = SCons.Util.CLVar('')
-    env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'
-    env['RCINCPREFIX'] = '--include-dir '
-    env['RCINCSUFFIX'] = ''
-    env['RCCOM'] = '$RC $_CPPDEFFLAGS $RCINCFLAGS ${RCINCPREFIX} ${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
-    env['BUILDERS']['RES'] = res_builder
-
-    # Some setting from the platform also have to be overridden:
-    env['OBJPREFIX']      = ''
-    env['OBJSUFFIX']      = '.o'
-    env['LIBPREFIX']      = 'lib'
-    env['LIBSUFFIX']      = '.a'
-    env['SHOBJPREFIX']    = '$OBJPREFIX'
-    env['SHOBJSUFFIX']    = '$OBJSUFFIX'
-    env['PROGPREFIX']     = ''
-    env['PROGSUFFIX']     = '.exe'
-    env['LIBPREFIX']      = ''
-    env['LIBSUFFIX']      = '.lib'
-    env['SHLIBPREFIX']    = ''
-    env['SHLIBSUFFIX']    = '.dll'
-    env['LIBPREFIXES']    = [ '$LIBPREFIX' ]
-    env['LIBSUFFIXES']    = [ '$LIBSUFFIX' ]
-
-def exists(env):
-    return find(env)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
--- a/build_files/scons/tools/mstoolkit.py
+++ b/build_files/scons/tools/mstoolkit.py
@@ -1,353 +0,0 @@
-"""tools.mstoolkit
-
-Tool-specific initialization for Microsoft Visual C/C++ Toolkit Commandline
-
-There normally shouldn't be any need to import this module directly.
-It will usually be imported through the generic SCons.Tool.Tool()
-selection method.
-
-"""
-
-#
-# Copyright (c) 2004 John Connors
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-
-import os.path
-import re
-import string
-import types
-
-import SCons.Action
-import SCons.Builder
-import SCons.Errors
-import SCons.Platform.win32
-import SCons.Tool
-import SCons.Util
-import SCons.Warnings
-
-CSuffixes = ['.c', '.C']
-CXXSuffixes = ['.cc', '.cpp', '.cxx', '.c++', '.C++']
-
-def get_msvctoolkit_paths():
-    """Return a 4-tuple of (INCLUDE, LIB, PATH, TOOLKIT) as the values of those
-    three environment variables that should be set in order to execute
-    the MSVC .NET tools properly, if the information wasn't available
-    from the registry."""
-
-    MSToolkitDir = None
-    paths = {}
-    exe_path = ''
-    lib_path = ''
-    include_path = ''
-
-    # First, we get the shell folder for this user:
-    if not SCons.Util.can_read_reg:
-        raise SCons.Errors.InternalError, "No Windows registry module was found"
-
-    # look for toolkit
-    if os.environ.has_key('VCToolkitInstallDir'):
-        MSToolkitDir = os.path.normpath(os.environ['VCToolkitInstallDir'])
-    else:
-        # last resort -- default install location
-        MSToolkitDir = r'C:\Program Files\Microsoft Visual C++ Toolkit 2003'
-
-    # look for platform sdk
-    if os.environ.has_key('MSSdk'):
-        PlatformSDKDir = os.path.normpath(os.environ['MSSdk'])
-    else:
-        try:
-            PlatformSDKDir = SCons.Util.RegGetValue(SCons.Util.HKEY_LOCAL_MACHINE, r'SOFTWARE\Microsoft\MicrosoftSDK\Directories\Install Dir')[0]
-            PlatformSDKDir = str(PlatformSDKDir)
-        except SCons.Util.RegError:
-            raise SCons.Errors.InternalError, "The Platform SDK directory was not found in the registry or in the `MSSdk` environment variable."
-
-    # look for DX Sdk (expecting DX9)
-    # dxsdk docs have a directory key, look for it, extract path
-    #dxsdkdocs = ""
-    DXsdkDir = ""
-    #try:
-    #   dxsdkdocs = SCons.Util.RegGetValue(SCons.Util.HKEY_LOCAL_MACHINE, r'SOFTWARE\Microsoft\DirectX SDK\DX9SDK Doc Path')
-    #except SCons.Util.RegError:
-    #   raise SCons.Errors.InternalError, "The DXSDK directory was not found in the registry."
-    if os.environ.has_key('DXSDK_DIR'):
-        DXsdkDir = os.path.normpath(os.environ['DXSDK_DIR'])
-
-    #DXsdkDir = os.path.split(dxsdkdocs[0])[0]
-    DXsdkDir = os.path.split(DXsdkDir)[0]
-
-    include_path = r'%s\include;%s\include;%s\include' % (MSToolkitDir, PlatformSDKDir, DXsdkDir)
-    lib_path = r'%s\lib;%s\lib;%s\lib' % (MSToolkitDir, PlatformSDKDir, DXsdkDir)
-    exe_path = r'%s\bin;%s\bin\win95;%s\bin' % (MSToolkitDir, PlatformSDKDir, PlatformSDKDir)
-    return (include_path, lib_path, exe_path, PlatformSDKDir)
-
-def validate_vars(env):
-    """Validate the PDB, PCH, and PCHSTOP construction variables."""
-    if env.has_key('PCH') and env['PCH']:
-        if not env.has_key('PCHSTOP'):
-            raise SCons.Errors.UserError, "The PCHSTOP construction must be defined if PCH is defined."
-        if not SCons.Util.is_String(env['PCHSTOP']):
-            raise SCons.Errors.UserError, "The PCHSTOP construction variable must be a string: %r"%env['PCHSTOP']
-
-def pch_emitter(target, source, env):
-    """Sets up the PDB dependencies for a pch file, and adds the object
-    file target."""
-
-    validate_vars(env)
-
-    pch = None
-    obj = None
-
-    for t in target:
-        if SCons.Util.splitext(str(t))[1] == '.pch':
-            pch = t
-        if SCons.Util.splitext(str(t))[1] == '.obj':
-            obj = t
-
-    if not obj:
-        obj = SCons.Util.splitext(str(pch))[0]+'.obj'
-
-    target = [pch, obj] # pch must be first, and obj second for the PCHCOM to work
-
-    if env.has_key('PDB') and env['PDB']:
-        env.SideEffect(env['PDB'], target)
-        env.Precious(env['PDB'])
-
-    return (target, source)
-
-def object_emitter(target, source, env, parent_emitter):
-    """Sets up the PDB and PCH dependencies for an object file."""
-
-    validate_vars(env)
-
-    parent_emitter(target, source, env)
-
-    if env.has_key('PDB') and env['PDB']:
-        env.SideEffect(env['PDB'], target)
-        env.Precious(env['PDB'])
-
-    if env.has_key('PCH') and env['PCH']:
-        env.Depends(target, env['PCH'])
-
-    return (target, source)
-
-def static_object_emitter(target, source, env):
-    return object_emitter(target, source, env,
-                          SCons.Defaults.StaticObjectEmitter)
-
-def shared_object_emitter(target, source, env):
-    return object_emitter(target, source, env,
-                          SCons.Defaults.SharedObjectEmitter)
-
-pch_builder = SCons.Builder.Builder(action='$PCHCOM', suffix='.pch', emitter=pch_emitter)
-res_builder = SCons.Builder.Builder(action='$RCCOM', suffix='.res')
-
-def pdbGenerator(env, target, source, for_signature):
-    if target and env.has_key('PDB') and env['PDB']:
-        return ['/PDB:%s'%target[0].File(env['PDB']).get_string(for_signature),
-                '/DEBUG']
-
-def win32ShlinkTargets(target, source, env, for_signature):
-    listCmd = []
-    dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-    if dll: listCmd.append("/out:%s"%dll.get_string(for_signature))
-
-    implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX')
-    if implib: listCmd.append("/implib:%s"%implib.get_string(for_signature))
-
-    return listCmd
-
-def win32ShlinkSources(target, source, env, for_signature):
-    listCmd = []
-
-    deffile = env.FindIxes(source, "WIN32DEFPREFIX", "WIN32DEFSUFFIX")
-    for src in source:
-        if src == deffile:
-            # Treat this source as a .def file.
-            listCmd.append("/def:%s" % src.get_string(for_signature))
-        else:
-            # Just treat it as a generic source file.
-            listCmd.append(src)
-    return listCmd
-
-def win32LibEmitter(target, source, env):
-    # SCons.Tool.msvc.validate_vars(env)
-
-    dll = env.FindIxes(target, "SHLIBPREFIX", "SHLIBSUFFIX")
-    no_import_lib = env.get('no_import_lib', 0)
-
-    if not dll:
-        raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")
-
-    if env.get("WIN32_INSERT_DEF", 0) and \
-       not env.FindIxes(source, "WIN32DEFPREFIX", "WIN32DEFSUFFIX"):
-
-        # append a def file to the list of sources
-        source.append(env.ReplaceIxes(dll,
-                                      "SHLIBPREFIX", "SHLIBSUFFIX",
-                                      "WIN32DEFPREFIX", "WIN32DEFSUFFIX"))
-
-    if env.has_key('PDB') and env['PDB']:
-        env.SideEffect(env['PDB'], target)
-        env.Precious(env['PDB'])
-
-    if not no_import_lib and \
-       not env.FindIxes(target, "LIBPREFIX", "LIBSUFFIX"):
-        # Append an import library to the list of targets.
-        target.append(env.ReplaceIxes(dll,
-                                      "SHLIBPREFIX", "SHLIBSUFFIX",
-                                      "LIBPREFIX", "LIBSUFFIX"))
-        # and .exp file is created if there are exports from a DLL
-        target.append(env.ReplaceIxes(dll,
-                                      "SHLIBPREFIX", "SHLIBSUFFIX",
-                                      "WIN32EXPPREFIX", "WIN32EXPSUFFIX"))
-
-    return (target, source)
-
-def prog_emitter(target, source, env):
-    #SCons.Tool.msvc.validate_vars(env)
-
-    if env.has_key('PDB') and env['PDB']:
-        env.SideEffect(env['PDB'], target)
-        env.Precious(env['PDB'])
-
-    return (target,source)
-
-def RegServerFunc(target, source, env):
-    if env.has_key('register') and env['register']:
-        ret = regServerAction([target[0]], [source[0]], env)
-        if ret:
-            raise SCons.Errors.UserError, "Unable to register %s" % target[0]
-        else:
-            print "Registered %s sucessfully" % target[0]
-        return ret
-    return 0
-
-regServerAction = SCons.Action.Action("$REGSVRCOM")
-regServerCheck = SCons.Action.Action(RegServerFunc, None)
-shlibLinkAction = SCons.Action.Action('${TEMPFILE("$SHLINK $SHLINKFLAGS $_SHLINK_TARGETS $( $_LIBDIRFLAGS $) $_LIBFLAGS $_PDB $_SHLINK_SOURCES")}')
-compositeLinkAction = shlibLinkAction + regServerCheck
-
-def generate(env):
-    """Add Builders and construction variables for MSVC++ to an Environment."""
-    static_obj, shared_obj = SCons.Tool.createObjBuilders(env)
-
-    for suffix in CSuffixes:
-        static_obj.add_action(suffix, SCons.Defaults.CAction)
-        shared_obj.add_action(suffix, SCons.Defaults.ShCAction)
-
-    for suffix in CXXSuffixes:
-        static_obj.add_action(suffix, SCons.Defaults.CXXAction)
-        shared_obj.add_action(suffix, SCons.Defaults.ShCXXAction)
-
-    SCons.Tool.createStaticLibBuilder(env)
-    SCons.Tool.createSharedLibBuilder(env)
-    SCons.Tool.createProgBuilder(env)
-
-    env['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Zi /Fd%s"%File(PDB)) or ""}'])
-    env['CCPCHFLAGS'] = SCons.Util.CLVar(['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'])
-    env['CCCOMFLAGS'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS'
-    env['CC']        = 'cl'
-    env['CCFLAGS']    = SCons.Util.CLVar('/nologo')
-    env['CCCOM']      = '$CC $CCFLAGS $CCCOMFLAGS'
-    env['SHCC']        = '$CC'
-    env['SHCCFLAGS']  = SCons.Util.CLVar('$CCFLAGS')
-    env['SHCCCOM']    = '$SHCC $SHCCFLAGS $CCCOMFLAGS'
-    env['CXX']      = '$CC'
-    env['CXXFLAGS']   = SCons.Util.CLVar('$CCFLAGS $( /TP $)')
-    env['CXXCOM']     = '$CXX $CXXFLAGS $CCCOMFLAGS'
-    env['SHCXX']      = '$CXX'
-    env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-    env['SHCXXCOM']   = '$SHCXX $SHCXXFLAGS $CCCOMFLAGS'
-    env['CPPDEFPREFIX']  = '/D'
-    env['CPPDEFSUFFIX']  = ''
-    env['INCPREFIX']  = '/I'
-    env['INCSUFFIX']  = ''
-    env['OBJEMITTER'] = static_object_emitter
-    env['SHOBJEMITTER'] = shared_object_emitter
-    env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
-
-    env['RC'] = 'rc'
-    env['RCFLAGS'] = SCons.Util.CLVar('')
-    env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES'
-    CScan = env.get_scanner('.c')
-    if CScan:
-        CScan.add_skey('.rc')
-    env['BUILDERS']['RES'] = res_builder
-
-    include_path, lib_path, exe_path, sdk_path = get_msvctoolkit_paths()
-    env.PrependENVPath('INCLUDE', include_path)
-    env.PrependENVPath('LIB', lib_path)
-    env.PrependENVPath('PATH', exe_path)
-
-    env['ENV']['CPU'] = 'i386'
-    env['ENV']['MSSDK'] = sdk_path
-    env['ENV']['BkOffice'] = sdk_path
-    env['ENV']['Basemake'] = sdk_path + "\\Include\\BKOffice.Mak"
-    env['ENV']['INETSDK'] = sdk_path
-    env['ENV']['MSSDK'] = sdk_path
-    env['ENV']['MSTOOLS'] = sdk_path
-    env['ENV']['TARGETOS'] = 'WINNT'
-    env['ENV']['APPVER'] = '5.0'
-
-    env['CFILESUFFIX'] = '.c'
-    env['CXXFILESUFFIX'] = '.cc'
-
-    env['PCHCOM'] = '$CXX $CXXFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo${TARGETS[1]} /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS'
-    env['BUILDERS']['PCH'] = pch_builder
-
-    env['AR']     = 'lib.exe' #'"' +sdk_path + '\\bin\\Win64\\lib.exe"'
-    env['ARFLAGS']     = SCons.Util.CLVar('/nologo')
-    env['ARCOM']       = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}"
-
-    env['SHLINK']      = '$LINK'
-    env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS /dll')
-    env['_SHLINK_TARGETS'] = win32ShlinkTargets
-    env['_SHLINK_SOURCES'] = win32ShlinkSources
-    env['SHLINKCOM']   =  compositeLinkAction
-    env['SHLIBEMITTER']= win32LibEmitter
-    env['LINK'] =  'link.exe' #'"' +sdk_path + '\\bin\\Win64\\' + 'link.exe"'
-    env['LINKFLAGS']   = SCons.Util.CLVar('/nologo')
-    env['_PDB'] = pdbGenerator
-    env["TEMPFILE"] = SCons.Platform.win32.TempFileMunge
-    env['LINKCOM'] = '${TEMPFILE("$LINK $LINKFLAGS /OUT:$TARGET $( $_LIBDIRFLAGS $) $_LIBFLAGS $_PDB $SOURCES")}'
-    env['PROGEMITTER'] = prog_emitter
-    env['LIBDIRPREFIX']='/LIBPATH:'
-    env['LIBDIRSUFFIX']=''
-    env['LIBLINKPREFIX']=''
-    env['LIBLINKSUFFIX']='$LIBSUFFIX'
-
-    env['WIN32DEFPREFIX']   = ''
-    env['WIN32DEFSUFFIX']   = '.def'
-    env['WIN32_INSERT_DEF']      = 0
-
-    env['WIN32EXPPREFIX']   = ''
-    env['WIN32EXPSUFFIX']   = '.exp'
-
-    env['REGSVRACTION'] = regServerCheck
-    env['REGSVR'] = os.path.join(SCons.Platform.win32.get_system_root(),'System32','regsvr32')
-    env['REGSVRFLAGS'] = '/s '
-    env['REGSVRCOM'] = '$REGSVR $REGSVRFLAGS $TARGET'
-
-
-def exists(env):
-    return env.Detect('cl')
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -0,0 +1,269 @@
+#
+# Note : if you want to alter this file
+# copy it as a whole in the upper folder
+# as user-config.py
+# dont create a new file with only some
+# vars changed.
+
+import commands
+
+# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
+USE_SDK=True
+
+BF_PYTHON_VERSION = '2.3'
+
+cmd = 'uname -p'
+MAC_PROC=commands.getoutput(cmd) 
+cmd = 'uname -r'
+cmd_res=commands.getoutput(cmd) 
+if cmd_res[0]=='7':
+	MAC_CUR_VER='10.3'
+elif cmd_res[0]=='8':
+	MAC_CUR_VER='10.4'
+else:
+	MAC_CUR_VER='10.5'
+
+if MAC_PROC == 'powerpc':
+	LCGDIR = '#../lib/darwin-6.1-powerpc'
+else :
+	LCGDIR = '#../lib/darwin-8.x.i386'
+LIBDIR = '${LCGDIR}'
+
+if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
+	MAC_MIN_VERS = '10.3'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
+else:
+	MAC_MIN_VERS = '10.4'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+BF_FFMPEG = "#extern/ffmpeg"
+BF_FFMPEG_INC = '${BF_FFMPEG}'
+if USE_SDK==True:
+	BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
+#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
+
+WITH_BF_VERSE = False
+BF_VERSE = "#extern/verse/dist"
+BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
+BF_VERSE_INCLUDE = BF_VERSE
+BF_VERSE_LIBS = "libverse"
+
+# python.org libs install in /library we want to use that for 2.5 
+#
+# if you want py2.5 on leopard without installing
+# change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+# BEWARE: in that case it will work only on leopard
+
+if BF_PYTHON_VERSION=='2.3':
+	BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
+else:
+	BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+
+BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = ''
+BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
+BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System -framework Python'
+if MAC_CUR_VER=='10.3' or  MAC_CUR_VER=='10.4':
+	BF_PYTHON_LINKFLAGS ='-u __dummy '+BF_PYTHON_LINKFLAGS
+	
+BF_QUIET = '1'
+WITH_BF_OPENMP = '0'
+
+# Note : should be true, but openal simply dont work on intel
+if MAC_PROC == 'i386':
+	WITH_BF_OPENAL = False
+else:
+	WITH_BF_OPENAL = True
+#different lib must be used  following version of gcc
+# for gcc 3.3
+#BF_OPENAL = LIBDIR + '/openal'
+# for gcc 3.4 and ulterior
+if MAC_PROC == 'powerpc':
+	BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+else :
+	BF_OPENAL = LIBDIR + '/openal'
+
+WITH_BF_STATICOPENAL = False
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '${LCGDIR}/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = LIBDIR + '/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/png'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = True
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE=True
+WITH_BF_PLAYER=True
+
+WITH_BF_ODE = False
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = '${BF_ODE}/include'
+BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = True
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB = 
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = True
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LIBDIR + '/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+#BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = True
+BF_OPENGL_LIB = 'GL GLU'
+BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
+BF_OPENGL_LINKFLAGS = '-framework OpenGL'
+
+CFLAGS = ['-pipe','-fPIC','-funsigned-char']
+
+CPPFLAGS = ['-fpascal-strings']
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fpascal-strings']
+CXXFLAGS = [ '-pipe','-fPIC','-funsigned-char', '-fpascal-strings']
+PLATFORM_LINKFLAGS = '-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime'
+
+#note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
+LLIBS = ['stdc++', 'SystemStubs']
+
+# some flags shuffling for different Os versions
+if MAC_MIN_VERS == '10.3':
+	CFLAGS = ['-fuse-cxa-atexit']+CFLAGS
+	CXXFLAGS = ['-fuse-cxa-atexit']+CXXFLAGS
+	PLATFORM_LINKFLAGS = '-fuse-cxa-atexit '+PLATFORM_LINKFLAGS
+	LLIBS.append('crt3.o')
+	
+if USE_SDK==True:
+	SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS]	
+	PLATFORM_LINKFLAGS = '-mmacosx-version-min='+MAC_MIN_VERS+ ' -Wl,-syslibroot,' + MACOSX_SDK+" "+PLATFORM_LINKFLAGS
+	CCFLAGS=SDK_FLAGS+CCFLAGS
+	CXXFLAGS=SDK_FLAGS+CXXFLAGS
+	
+# you can add -mssse3 if gcc >= 4.2
+if MAC_PROC == 'i386':
+	REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
+	REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
+else:
+	CFLAGS = CFLAGS+['-fno-strict-aliasing']
+	CCFLAGS =  CCFLAGS+['-fno-strict-aliasing']
+	CXXFLAGS = CXXFLAGS+['-fno-strict-aliasing']
+	
+	REL_CFLAGS = ['-O2']
+	REL_CCFLAGS = ['-O2']
+
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+CC = 'gcc'
+CXX = 'g++'
+C_WARN = ['-Wdeclaration-after-statement']
+
+CC_WARN = ['-Wall', '-Wno-long-double']
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
+BF_PROFILE = False
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g']
+
+BF_BUILDDIR='../build/darwin'
+BF_INSTALLDIR='../install/darwin'
+BF_DOCDIR='../install/doc'
--- a/config/irix6-config.py
+++ b/config/irix6-config.py
@@ -0,0 +1,223 @@
+import os
+
+LCGDIR = os.getcwd()+"/../lib/irix-6.5-mips"
+LIBDIR = LCGDIR
+print LCGDIR
+
+WITH_BF_VERSE = 'false'
+BF_VERSE_INCLUDE = "#extern/verse/dist"
+
+BF_PYTHON = LCGDIR+'/python'
+BF_PYTHON_VERSION = '2.5'
+WITH_BF_STATICPYTHON = 'true'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+
+WITH_BF_OPENAL = 'true'
+WITH_BF_STATICOPENAL = 'true'
+BF_OPENAL = LCGDIR+'/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+BF_OPENAL_LIBPATH = LIBDIR + '/lib'
+
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = 'true'
+BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_OPENEXR = 'false'
+WITH_BF_STATICOPENEXR = 'false'
+BF_OPENEXR = '/usr'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+
+WITH_BF_DDS = 'false'
+
+WITH_BF_JPEG = 'false'
+BF_JPEG = LCGDIR+'/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = 'false'
+BF_PNG = LCGDIR+"/png"
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = '/usr/nekoware'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = 'true'
+BF_ZLIB = LCGDIR+"/zlib"
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = 'true'
+
+BF_GETTEXT = LCGDIR+'/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextpo intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = 'true'
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE='false'
+
+WITH_BF_ODE = 'false'
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = 'true'
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = 'true'
+
+#WITH_BF_NSPR = 'true'
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB = 
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = 'true'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LCGDIR+'/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = 'true'
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv charset'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = 'false'
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
+# Uncomment the following two lines to use system's ffmpeg
+BF_FFMPEG = LCGDIR+'/ffmpeg'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice faad faac vorbis x264 ogg mp3lame z'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = 'false'  # -DWITH_OGG 
+BF_OGG = '/usr'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+
+WITH_BF_OPENJPEG = 'false' 
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = 'false'  
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = 'false'
+BF_OPENGL = '/usr'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi Xext'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
+
+
+CC = 'c99'
+CXX = 'CC'
+
+
+CCFLAGS = ['-pipe','-fPIC', '-n32']
+
+CPPFLAGS = ['-DXP_UNIX']
+CXXFLAGS = ['-pipe','-fPIC', '-n32']
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
+##BF_DEPEND = 'true'
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = '-no_prelink -ptused'
+
+CC_WARN = '-no_prelink -ptused'
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = 'c m dl pthread dmedia movie'
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE = 'false'
+
+BF_DEBUG = 'false'
+BF_DEBUG_FLAGS = '-g'
+
+BF_BUILDDIR = '../build/irix6'
+BF_INSTALLDIR='../install/irix6'
+BF_DOCDIR='../install/doc'
+
+#Link against pthread
+LDIRS = []
+LDIRS.append(BF_FREETYPE_LIBPATH)
+LDIRS.append(BF_PNG_LIBPATH)
+LDIRS.append(BF_ZLIB_LIBPATH)
+LDIRS.append(BF_SDL_LIBPATH)
+LDIRS.append(BF_OPENAL_LIBPATH)
+LDIRS.append(BF_ICONV_LIBPATH)
+
+PLATFORM_LINKFLAGS = []
+for x in LDIRS:
+    PLATFORM_LINKFLAGS.append("-L"+x)
+    
+PLATFORM_LINKFLAGS += ['-L${LCGDIR}/jpeg/lib' , '-L/usr/lib32',  '-n32', '-v', '-no_prelink']
+print PLATFORM_LINKFLAGS
+LINKFLAGS= PLATFORM_LINKFLAGS
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -0,0 +1,217 @@
+LCGDIR = '../lib/linux2'
+LIBDIR = "${LCGDIR}"
+
+WITH_BF_VERSE = False
+BF_VERSE_INCLUDE = "#extern/verse/dist"
+
+def py_version_string():
+	'''
+	returns py version - "2.5", "2.6" etc
+	'''
+	import platform
+	ver = platform.python_version_tuple()
+	return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6 ints
+
+BF_PYTHON = '/usr'
+BF_PYTHON_VERSION = py_version_string()
+WITH_BF_STATICPYTHON = False
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = '/usr'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+
+BF_TIFF = '/usr'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = True
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
+
+WITH_BF_ODE = False
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = True
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB = 
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = True
+
+# enable freetype2 support for text objects
+BF_FREETYPE = '/usr'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = False
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = True
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+BF_FFMPEG = '#extern/ffmpeg'
+BF_FFMPEG_LIB = ''
+# Uncomment the following two lines to use system's ffmpeg
+# BF_FFMPEG = '/usr'
+# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
+BF_FFMPEG_INC = '${BF_FFMPEG}'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = False  # -DWITH_OGG 
+BF_OGG = '/usr'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
+
+WITH_BF_OPENJPEG = True 
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = False  
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+# BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = '/usr'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
+##
+CC = 'gcc'
+CXX = 'g++'
+##ifeq ($CPU),alpha)
+##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
+
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+
+CPPFLAGS = ['-DXP_UNIX']
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
+CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g']
+
+BF_BUILDDIR = '../build/linux2'
+BF_INSTALLDIR='../install/linux2'
+BF_DOCDIR='../install/doc'
+
+
+#Link against pthread
+PLATFORM_LINKFLAGS = ['-pthread']
+
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -0,0 +1,155 @@
+LCGDIR = '#../lib/windows'
+LIBDIR = '${LCGDIR}'
+
+WITH_BF_VERSE = False
+BF_VERSE_INCLUDE = "#extern/verse/dist"
+
+WITH_BF_YAFRAY = True
+
+BF_PYTHON = LIBDIR + '/python'
+BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = 'python'
+BF_PYTHON_LIB = 'python25'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal_static'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+BF_PTHREADS = LIBDIR + '/pthreads'
+BF_PTHREADS_INC = '${BF_PTHREADS}/include'
+BF_PTHREADS_LIB = 'pthreadGC2'
+BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = LIBDIR + '/gcc/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = ' Half IlmImf Iex '
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = LIBDIR + '/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/png'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = LIBDIR + '/zlib'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+#BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = True
+BF_FTGL = LIBDIR + '/ftgl'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE = False
+
+WITH_BF_ODE = True
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+BF_WINTAB = LIBDIR + '/wintab'
+BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LIBDIR + '/gcc/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = False
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = 'C:\\MingW'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB = 'opengl32 glu32'
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
+             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+
+CC = 'i586-mingw32msvc-gcc'
+CXX = 'i586-mingw32msvc-g++'
+
+CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
+
+CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ]
+CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
+REL_CFLAGS = [ '-O2' ]
+REL_CCFLAGS = [ '-O2' ]
+C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
+
+CC_WARN = [ '-Wall' ]
+
+
+LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS= []
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_BUILDDIR = '../build/linuxcross'
+BF_INSTALLDIR='../install/linuxcross'
+BF_DOCDIR='../install/doc'
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -0,0 +1,164 @@
+LCGDIR = '../lib/openbsd3'
+LIBDIR = '${LCGDIR}'
+
+BF_PYTHON = '/usr/local'
+BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
+
+WITH_BF_OPENAL = False
+# WITH_BF_STATICOPENAL = False
+#BF_OPENAL = LIBDIR + '/openal'
+#BF_OPENAL_INC = '${BF_OPENAL}/include'
+#BF_OPENAL_LIB = 'openal'
+#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+#BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_OPENEXR = False
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr/local'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr/local'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr/local'
+BF_PNG_INC = '${BF_PNG}/include/libpng'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = '/usr/local'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr/local'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr/local'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl iconv'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = True
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE=False
+
+WITH_BF_ODE = False
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = '${BF_ODE}/include'
+BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = True
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB = 
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = True
+
+# enable freetype2 support for text objects
+BF_FREETYPE = '/usr/X11R6'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+
+WITH_BF_ICONV = False
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = True
+BF_OPENGL = '/usr/X11R6'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIBPATH = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
+##
+##CC = gcc
+##CCC = g++
+##ifeq ($CPU),alpha)
+##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
+
+CFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+
+CPPFLAGS = []
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+CC = 'gcc'
+CXX = 'g++'
+C_WARN = ['-Wdeclaration-after-statement']
+
+CC_WARN = ['-Wall']
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['m', 'stdc++', 'pthread', 'util']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g']
+
+BF_BUILDDIR='../build/openbsd3'
+BF_INSTALLDIR='../install/openbsd3'
+BF_DOCDIR='../install/doc'
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -0,0 +1,181 @@
+LCGDIR = '../lib/sunos5'
+LIBDIR = '${LCGDIR}'
+
+BF_PYTHON = '/usr/local'
+BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = '/usr/local'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+BF_OPENAL_LIB = 'openal'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr/local'
+BF_OPENEXR_INC = ['${BF_OPENEXR}/include', '${BF_OPENEXR}/include/OpenEXR' ]
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr/local'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr/local'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+BF_PNG_LIB = 'png'
+
+BF_TIFF = '/usr/local'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr/local'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = True
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE=False
+
+WITH_BF_ODE = False
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = True
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB = 
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = True
+
+# enable freetype2 support for text objects
+BF_FREETYPE = '/usr/local'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+BF_FREETYPE_LIB = 'freetype'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = True
+BF_ICONV = "/usr"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = False  # -DWITH_FFMPEG
+BF_FFMPEG = '/usr/local'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+BF_FFMPEG_LIB = 'avformat avcodec avutil avdevice'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = '/usr/openwin'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIBPATH = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
+##
+CC = 'gcc'
+CXX = 'g++'
+##ifeq ($CPU),alpha)
+##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
+
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+
+CPPFLAGS = ['-DXP_UNIX', '-DSUN_OGL_NO_VERTEX_MACROS']
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
+
+CC_WARN = ['-Wall']
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['c', 'm', 'dl', 'pthread', 'stdc++']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
+BF_PROFILE = False
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = []
+
+BF_BUILDDIR = '../build/sunos5'
+BF_INSTALLDIR='../install/sunos5'
+BF_DOCDIR='../install/doc'
+
+
+PLATFORM_LINKFLAGS = []
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -0,0 +1,176 @@
+LCGDIR = '#../lib/windows'
+LIBDIR = "${LCGDIR}"
+
+WITH_BF_VERSE = False
+BF_VERSE_INCLUDE = "#extern/verse/dist"
+
+BF_PYTHON = LIBDIR + '/python'
+BF_PYTHON_VERSION = '2.5'
+#BF_PYTHON_VERSION = '2.6'
+WITH_BF_STATICPYTHON = False
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = 'python'
+#BF_PYTHON_LIB = 'python25'
+#BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
+#BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+WITH_BF_FFMPEG = True
+BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
+BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+BF_PTHREADS = LIBDIR + '/pthreads'
+BF_PTHREADS_INC = '${BF_PTHREADS}/include'
+BF_PTHREADS_LIB = 'pthreadGC2'
+BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = LIBDIR + '/gcc/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = ' Half IlmImf Iex '
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = LIBDIR + '/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/png'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'libtiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = LIBDIR + '/zlib'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = True
+BF_FTGL = LIBDIR + '/ftgl'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE = False
+
+WITH_BF_ODE = True
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+BF_WINTAB = LIBDIR + '/wintab'
+BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
+
+WITH_BF_YAFRAY = True
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB = 
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LIBDIR + '/gcc/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = False
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = 'C:\\MingW'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB = 'opengl32 glu32'
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
+             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+##
+CC = 'gcc'
+CXX = 'g++'
+
+CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
+
+CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ]
+CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
+REL_CFLAGS = [ '-O2' ]
+REL_CCFLAGS = [ '-O2' ]
+
+C_WARN = [ '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
+
+CC_WARN = [ '-Wall' ]
+
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS= ['-g']
+
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
+BF_PROFILE = False
+
+BF_BUILDDIR = '..\\build\\win32-mingw'
+BF_INSTALLDIR='..\\install\\win32-mingw'
+BF_DOCDIR = '..\\install\\doc'
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -0,0 +1,208 @@
+LCGDIR = '#../lib/windows'
+LIBDIR = '${LCGDIR}'
+
+WITH_BF_VERSE = False
+BF_VERSE_INCLUDE = "#extern/verse/dist"
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
+
+BF_PYTHON = LIBDIR + '/python'
+BF_PYTHON_VERSION = '2.6'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = 'python'
+BF_PYTHON_LIB = 'python26'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
+BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+# TODO - are these useful on win32?
+# BF_CXX = '/usr'
+# WITH_BF_STATICCXX = False
+# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + '/iconv'
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL.lib'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+BF_PTHREADS = LIBDIR + '/pthreads'
+BF_PTHREADS_INC = '${BF_PTHREADS}/include'
+BF_PTHREADS_LIB = 'pthreadVC2'
+BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = LIBDIR + '/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = LIBDIR + '/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'libjpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/png'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'libpng_st'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'libtiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = LIBDIR + '/zlib'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'libz'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = True
+BF_FTGL = LIBDIR + '/ftgl'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
+
+WITH_BF_ODE = True
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+BF_WINTAB = LIBDIR + '/wintab'
+BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
+
+WITH_BF_YAFRAY = True
+
+WITH_BF_BINRELOC = False
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB = 
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = True
+
+# enable freetype2 support for text objects
+BF_WITH_FREETYPE = True
+BF_FREETYPE = LIBDIR + '/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype2ST'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+BF_QUICKTIME = LIBDIR + '/QTDevWin'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
+BF_QUICKTIME_LIB = 'qtmlClient'
+BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
+
+WITH_BF_OPENJPEG = True 
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = False  
+BF_REDCODE_INC = '#extern'
+
+WITH_BF_STATICOPENGL = False
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB = 'opengl32 glu32'
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
+                         '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+                         '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+CC = 'cl.exe'
+CXX = 'cl.exe'
+
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CXXFLAGS = ['/EHsc']
+
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
+
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
+REL_CFLAGS = ['-O2', '-DNDEBUG']
+REL_CCFLAGS = ['-O2', '-DNDEBUG']
+REL_CXXFLAGS = ['-O2', '-DNDEBUG']
+
+C_WARN = []
+CC_WARN = []
+CXX_WARN = []
+
+LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
+
+PLATFORM_LINKFLAGS = '''
+                       /SUBSYSTEM:CONSOLE
+                       /MACHINE:IX86
+                       /ENTRY:mainCRTStartup
+                       /INCREMENTAL:NO
+                       /NODEFAULTLIB:"msvcprt.lib"
+                       /NODEFAULTLIB:"glut32.lib"
+                       /NODEFAULTLIB:"libc.lib"
+                       /NODEFAULTLIB:"libcd.lib"
+                       /NODEFAULTLIB:"libcpd.lib"
+                       /NODEFAULTLIB:"libcp.lib"
+                       /LARGEADDRESSAWARE
+                   '''
+
+# # Todo
+# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+# BF_PROFILE_LINKFLAGS = ['-pg']
+# BF_PROFILE = False
+
+BF_BUILDDIR = '..\\build\\win32-vc'
+BF_INSTALLDIR='..\\install\\win32-vc'
+BF_DOCDIR='..\\install\\doc'
--- a/doc/license/BL-license.txt
+++ b/doc/license/BL-license.txt
@@ -32,4 +32,4 @@ license@blender.org for further information.

 Ton Roosendaal
 Chairman Blender Foundation.
-June 2005
+June 2005
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -0,0 +1,943 @@
+# Doxyfile 1.2.15
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = Blender
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = V2.27
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = 
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Chinese, Croatian, Czech, Danish, Dutch, Finnish, French, 
+# German, Greek, Hungarian, Italian, Japanese, Korean, Norwegian, Polish, 
+# Portuguese, Romanian, Russian, Slovak, Slovene, Spanish and Swedish.
+
+OUTPUT_LANGUAGE        = English
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these class will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
+# members of a class in the documentation of that class as if those members were 
+# ordinary class members. Constructors, destructors and assignment operators of 
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. It is allowed to use relative paths in the argument list.
+
+STRIP_FROM_PATH        = 
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower case letters. If set to YES upper case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# users are adviced to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments  will behave just like the Qt-style comments (thus requiring an 
+# explict @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# reimplements.
+
+INHERIT_DOCS           = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = YES
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consist of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
+# only. Doxygen will then generate output that is more tailored for C. 
+# For instance some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
+# only. Doxygen will then generate output that is more tailored for Java. 
+# For instance namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT =  doxygen.main ../source/creator/ ../source/blender/src/B.blend.c ../source/blender/src/blenderbuttons.c ../source/blender/readblenfile/intern/BLO_readblenfile.c ../intern/ghost/GHOST_C-api.h ../source/blender/imbuf/ ../source/blender/src/mainqueue.c
+
+# cmccad - The following lines are directories which will eventually be included:
+#
+# ../source/blender/blenkernel/ ../source/blender/imbuf/ ../source/blender/render/
+# ../source/blender/blenlib/ ../source/blender/include
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
+# *.h++ *.idl *.odl
+
+FILE_PATTERNS          = 
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
+# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.
+
+INPUT_FILTER           = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse.
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the Html help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript and frames is required (for instance Mozilla, Netscape 4.0+, 
+# or Internet explorer 4.0+). Note that for large projects the tree generation 
+# can take a very long time. In such cases it is better to disable this feature. 
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimised for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assigments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_XML           = NO
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed.
+
+PREDEFINED             = BUILD_DATE
+
+# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line and do not end with a semicolon. Such function macros are typically 
+# used for boiler-plate code, and will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tagfiles.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in Html, RTF and LaTeX) for classes with base or 
+# super classes. Setting the tag to NO turns the diagrams off. Note that this 
+# option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
+# recommended to install and use dot, since it yield more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found on the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermedate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
+
+# The CGI_NAME tag should be the name of the CGI script that 
+# starts the search engine (doxysearch) with the correct parameters. 
+# A script with this name will be generated by doxygen.
+
+CGI_NAME               = search.cgi
+
+# The CGI_URL tag should be the absolute URL to the directory where the 
+# cgi binaries are located. See the documentation of your http daemon for 
+# details.
+
+CGI_URL                = 
+
+# The DOC_URL tag should be the absolute URL to the directory where the 
+# documentation is located. If left blank the absolute path to the 
+# documentation, with file:// prepended to it, will be used.
+
+DOC_URL                = 
+
+# The DOC_ABSPATH tag should be the absolute path to the directory where the 
+# documentation is located. If left blank the directory on the local machine 
+# will be used.
+
+DOC_ABSPATH            = 
+
+# The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
+# is installed.
+
+BIN_ABSPATH            = /usr/local/bin/
+
+# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
+# documentation generated for other projects. This allows doxysearch to search 
+# the documentation for these projects as well.
+
+EXT_DOC_PATHS          = 
--- a/doc/license/GPL-license.txt
+++ b/doc/license/GPL-license.txt
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.

    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.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


 Also add information on how to contact you by electronic and paper mail.
--- a/doc/README.windows-gcc
+++ b/doc/README.windows-gcc
@@ -0,0 +1,123 @@
+An updated version of this guide can be found at:
+
+http://www.blender3d.org/cms/Building_with_Cygwin.524.0.html
+
+Introduction
+------------
+
+Here are some basic instructions for building
+blender for windows using gcc under cygwin.
+Please note that the resulting executable does not
+depend on cygwin and can be distrubuted to machines
+that don't have cygwin installed.
+
+The instructions are:
+
+1. Download cygwin (www.cygwin.com) and use the setup program
+   to install packages for gcc, gcc-mingw, gcc-g++, w32api, make, cvs,
+   python, perl, gettext, and gettext-devel (and maybe others... the 
+   dependency list is bound to change over time and hopefully these 
+   instructions will keep up with the changes). All of the following
+   commands will be entered at the cygwin prompt so launch
+   cygwin now.
+
+2. Create a directory to put your sources and then enter that
+   directory, e.g.:
+     mkdir bf-blender
+     cd bf-blender
+
+   *********WARNING: if the directory path you are in contains a space in
+   it you will get errors in trying to compile the code.  Change directorys
+   to a one that does not contain a space in the path before creating the
+   above directory *********
+
+
+Please note that a backslash at the end of a line in the following 
+means that the command spans two lines. If you wish to type the command as 
+one line, exclude the '\'.
+
+3. Checkout the blender module from the bf-blender tree using cvs 
+   (use password anonymous):
+     cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender login
+     cvs -z3 -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender \
+          co blender
+
+4. Checkout the lib/windows module from bf-blender using cvs:
+     cvs -z3 -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender \
+          co lib/windows
+
+5. Enter the newly created blender directory:
+     cd blender
+
+6. To prepare the build system to use only the free tools we must
+   set some environment variables. This is done by creating a
+   file called "user-def.mk" in the blender directory and
+   inserting the following line with notepad or your favorite
+   text editor:
+       export FREE_WINDOWS=true
+
+   The quickest way to do this though is to issue the following
+   command:
+      echo 'export FREE_WINDOWS=true' > user-def.mk
+
+7. Time to build... issue the command:
+     make
+
+8. Wait for it to finish (there is this mysterious place called 
+   'outside' that I am told is nice to go to while waiting for a 
+   compile to finish).
+
+9. After it finishes compiling, if you would like to run your freshly compiled
+   blender, type make release.  Then change directorys to obj/233.a/ and move
+   the zip file to where you want to use it, unzip the file, enter the directory
+   and run your brand new blender.
+
+
+Getting Help
+------------
+If you have problems, come by #blendercompilers on irc.freenode.net
+or post questions to the "Compiling, Libraries, Modules" forum
+at www.blender.org. There is also the very useful bf-committers 
+mailing list, what you can subscribe to here:
+
+http://www.blender.org/mailman/listinfo/bf-committers
+(as a bonus you can get info about the most recent features that
+are coming down the pipe ...)
+
+This said, the most common fix to a problem will
+probably involve installing an additional cygwin package,
+so keep that cygwin setup program close by ...
+
+Some final notes
+----------------
+
+- The build will take a long time, even on a fast machine
+  (a clean build takes almost an hour on my Athlon 1800+
+  based laptop).
+- If the build is successful you will find it has created
+  the program obj/windows/bin/blender.exe
+- The executable generated by gcc will generally be slower
+  that an msvc++ generated executable at rendering, but the 
+  OpenGL speed should be about the same.
+- Sound is disabled
+- If you want to clean your sources issue a 'make clean'
+  in the top blender directory.
+- If you want to update your sources when somebody has
+  added a new awesome feature, you will want to go to the
+  topmost blender directory and issue the following command:
+      cvs -z3 update -P -d
+  It would probably be best to clean your sources before
+  re-building (see previous note).
+- This is a work in progress, so some things may not be working
+  right or it may not support all of the cutting edge features.
+- Want to make a fancy zipped up blender package to give
+  to your buddies? Try "make release" ... read the output
+  to find out where the zip file was placed (note: you will
+  probably need the zip/unzip packages from cygwin to do
+  this).
+- You can make a debug executable using 'make debug'. The
+  debug executable will be larger and slower that the
+  regular executable, but when used with the gnu debugger
+  (gdb) it can help debug a blender problem (for example,
+  it can locate the line of code that caused blender to
+  crash).
--- a/doc/license/bf-members.txt
+++ b/doc/license/bf-members.txt
@@ -1390,4 +1390,4 @@ Radoslav Dejanovic
 James H. Cloos, Jr. 
 Karl Erlandsen (LethalSideParting)
 Kari Pulli
-Dave Shemano
+Dave Shemano
--- a/doc/blender-cmake.txt
+++ b/doc/blender-cmake.txt
@@ -0,0 +1,156 @@
+$Id$
+
+    Blender CMake build system
+    ============================
+
+    Contents
+    ---------------
+
+    1. Introduction
+    2. Obtaining CMake
+    3. Obtaining Dependencies
+    4. Deciding on a Build Environment
+    5. Configuring the build for the first time
+    6. Configuring the build after CVS updates
+    7. Specify alternate Python library versions and locations
+
+
+    1. Introduction
+    ---------------
+
+    This document describes general usage of the new CMake scripts. The
+    inner workings will be described in blender-cmake-dev.txt (TODO).
+
+    2. Obtaining CMake
+    ------------------
+
+    CMake for can either be downloaded using your favorite package manager 
+    or is also available from the CMake website at http://www.cmake.org 
+    The website also contains some documentation on CMake usage but I found
+    the man page alone pretty helpful. 
+
+    3. Obtaining Dependencies
+    -------------------------
+
+    Check from the page
+    http://www.blender.org/cms/Getting_Dependencies.135.0.html that you
+    have all dependencies needed for building Blender. Note that for
+    windows many of these dependencies already come in the lib/windows
+    module from CVS.
+
+    4. Deciding on a Build Environment
+    ----------------------------------
+
+    To build Blender with the CMake scripts you first need to decide which
+    build environment you feel comfortable with. This decision will also be
+    influenced by the platform you are developing on. The current implementation
+    have been successfully used to generate build files for the following 
+    environments:
+
+    1. Microsoft Visual Studio 2005. There is a free version available
+       at http://msdn.microsoft.com/vstudio/express/visualc/.
+
+    2. Xcode on Mac OSX
+
+    3. Unix Makefiles (On Linux and Mac OSX): CMake actually creates make 
+       files which generates nicely color coded output and a percentage 
+       progress indicator.
+
+
+    5. Configuring the build for the first time
+    -------------------------------------------
+
+    CMake allows one to generate the build project files and binary objects
+    outside the source tree which can be pretty handy in working and experimenting
+    with different Blender configurations (Audio/NoAudio, GameEngine/NoGameEngine etc.)
+    while maintaining a clean source tree. It also makes it possible to generate files
+    for different build systems on the same source tree. This also has benefits for 
+    general CVS management for the developer as patches and submit logs are much cleaner.
+
+    Create a directory outside the blender source tree where you would like to build
+    Blender (from now on called $BLENDERBUILD). On the commandline you can then run
+    the cmake command to generate your initial build files. First just run 'cmake' which
+    will inform you what the available generators are. Thn you can run 
+    'cmake -G generator $BLENDERSOURCE' to generate the build files. Here is an example 
+    of all this for Xcode:
+
+        % mkdir $BLENDERBUILD
+        % cd $BLENDERBUILD
+        % cmake
+
+		...
+		...
+		--version [file]            = Show program name/version banner and exit.
+
+		Generators
+
+		The following generators are available on this platform:
+		  KDevelop3                   = Generates KDevelop 3 project files.
+		  Unix Makefiles              = Generates standard UNIX makefiles.
+		  Xcode                       = Generate XCode project files.
+
+
+
+        % cmake -G Xcode $BLENDERSOURCE
+		...
+		...
+		-- Configuring blender
+		-- Configuring blenderplayer
+		-- Configuring done
+		-- Generating done
+		-- Build files have been written to: $BLENDERBUILD 
+
+    This will generate the build files with default values. Specific features can
+    be enabled or disabled by running the ccmake "GUI" from $BLENDERBUILD as follows:
+
+        % ccmake $BLENDERSOURCE
+
+    A number of options appear which can be changed depending on your needs and
+    available dependencies (e.g. setting WITH_OPENEXR to OFF will disable support
+    for OpenEXR). It will also allow you to override default and detected paths 
+    (e.g. Python directories) and compile and link flags. When you are satisfied
+    used ccmake to re-configure the build files and exit.
+
+    It is also possible to use the commandline of 'cmake' to override certain
+    of these settings. 
+
+    6. Configuring the build after CVS updates
+    ------------------------------------------
+
+    The $BLENDERBUILD directory maintains a file called CMakeCache.txt which 
+    remembers the initial run's settings for subsequent generation runs. After
+    every CVS update it may be a good idea to rerun the generation before building
+    Blender again. Just rerun the original 'cmake' run to do this, the settings
+    will be remembered. For the example above the following will do after every
+    'cvs up':
+
+        % cmake -G Xcode $BLENDERSOURCE
+
+    7. Specify alternate Python library versions and locations
+    ----------------------------------------------------------
+    
+    The commandline can be used to override detected/default settings, e.g:
+ 
+    On Unix: 
+      cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
+    On Macs: 
+      cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
+
+    Mote that this should only be needed once per build directory generation because it will keep the overrides in CMakeCache.txt for subsequent runs.
+
+
+
+    To be continued...
+
+    TODO's
+    ------
+
+    1. Get CMake to create proper distribution directories for the various platforms
+       like scons does.
+    2. Investigate the viability of using CPack to package installs automatically.
+    3. Refine this document and write detailed developer's document.
+    4. Make sure all options (ffmpeg, openexr, quicktime) has proper CMake support
+       on the various platforms.    
+
+    /Jacques Beaurain (jbinto)
+
--- a/doc/guides/blender-guardedalloc.txt
+++ b/doc/guides/blender-guardedalloc.txt
--- a/doc/blender-scons-dev.txt
+++ b/doc/blender-scons-dev.txt
@@ -0,0 +1,194 @@
+$Id$
+
+
+    Internals of Blenders SCons scripts
+    ===================================
+
+    Scope
+    ------
+    This document describes the architecture of the SCons scripts for
+    Blender. An overview of available functionality and how to modify,
+    extend and maintain the system.
+
+    Audience
+    --------
+    This document is for developers who need to modify the system,
+    ie. add or remove new libraries, add new arguments for SCons, etc.
+
+    Files and their meaning
+    -----------------------
+
+    The main entry point for the build system is the SConstruct-file in
+    $BLENDERHOME. This file creates the first BlenderEnvironment to work
+    with, reads in options, and sets up some directory structures. Further
+    it defines some targets.
+
+    Platform-specific configurations are in $BLENDERHOME/config. The
+    filenames have the form (platform)-config.py, where platform one of:
+
+        * darwin
+        * linux2
+        * win32-mingw
+        * win32-vc
+
+    The user can override options by creating a file
+    $BLENDERHOME/user-config.py. It can have any option from
+    (platform)-config.py. Options in this file will override the platform
+    defaults.
+
+    Much of the actual functionality can be found in the python scripts
+    in the directory $BLENDERHOME/tools, with Blender.py defining the
+    bulk of the functionality. btools.py has some helper functions, and
+    bcolors.py is for the terminal colours. mstoolkit.py and crossmingw.py
+    are modules which set up SCons for the MS VC++ 2003 toolkit and
+    the cross-compile toolset for compiling Windows binaries on Linux
+    respectively. Note: the cross-compile doesn't work yet for Blender,
+    but is added in preparation for having it work in the distant future.
+
+    BlenderEnvironment
+    ------------------
+
+    The module Blender.py implements a BlenderEnvironment class, derived
+    from the SConsEnvironment of SCons. This is done to wrap some often
+    used functionality. The BlenderEnvironment offers two important
+    wrappers: BlenderProg() and BlenderLib(). The first one is used to
+    specify a binary to be built, the second one is used to specify what
+    static library is built from given sources.
+
+    Build a static library called "somelib". The system handles library
+    pre- and suffixes automatically, you don't need to bother yourself
+    with these details:
+
+        env = BlenderEnvironment(ENV = os.environ) # create an environment
+        env.BlenderLib(libname="somelib", sources=['list.c','with.c','sources.c'],
+                        includes=['/list/with/include/paths', '.', '..'],
+                        defines=['LIST_WITH', 'CPP_DEFINES', 'TO_USE'],
+                        libtype=['blender', 'common'] # this is a list with libtypes. Normally you don't
+                                                      # need to specify this, but if you encounter linking
+                                                      # problems you may need this
+                        priority=[10, 20]             # Priorities, list as long as libtype, priority per type
+                        compileflags=['/O2']          # List of compile flags needed for this particular library.
+                                                      # used only in rare cases, like SOLID, qhull and Bullet
+                        )
+
+    There should be no need to ever add an extra BlenderProg to the
+    existing ones in SConstruct, see that file for its use, and Blender.py
+    for its implementation.
+
+    The new system works so that using these wrappers, has all libraries
+    (and programs) register with a central repository. This means that
+    adding a new library is as easy as just creating the new SConscript
+    and making sure that it gets called properly. Linking and such will
+    then be handled automatically.
+
+    If you want that adding new source files for a certain library
+    is handled automatically, you can use the Glob() function from
+    the BlenderEnvironment to create lists of needed files. See
+    $BLENDERHOME/source/blender/src/SConscript for an example. Keep in
+    mind that this will add any new file that complies to the rule given
+    to the Glob() function. There are a few (external) libraries with
+    which this can't be used, because it'd take files that shouldn't be
+    compiled, and create subsequentially problems during the linking stage
+    (like SOLID, qhull, Bullet).
+
+    Linking order and priorities
+    ----------------------------
+
+    As shown above, you can give a library a priority in a certain
+    group. If you need to make sure that a Blender library is linked
+    before or after another one, you can give it a priority. To debug
+    the priorities us BF_PRIORITYLIST=1 on the command-line while running
+    a build.
+
+    % scons BF_PRIORITYLIST=1
+
+    This will give a list with values suggested by the system. Make
+    changes to all SConscripts in question to reflect or change the
+    values given by this command. ALWAYS check this after adding a new
+    internal, external library or core library, and make sure there are
+    sane values. You can use large and negative numbers to test with,
+    but after you've got a working linking order, do change the system
+    to reflect BF_PRIORITYLIST values.
+
+    Also, if you find that a library needs to be given multiple times to
+    the linker, you can do that by giving a python list with the names
+    of the available library types. They are currently:
+
+        B.possible_types = ['core', 'common', 'blender', 'intern',
+                            'international', 'game', 'game2',
+                            'player', 'player2', 'system']
+
+    More groups can be added, but that should be carefully considered,
+    as it may lead to large-scale changes. The current amount of libraries
+    should suffice.
+
+    The central repository is utilised in the SConstruct in two
+    ways. Firstly, it is used to determine the order of all static
+    libraries to link into the main Blender executable. Secondly, it
+    is used to keep track of all built binaries and their location,
+    so that they can be properly copied to BF_INSTALLDIR.
+
+    The libraries can be fetched in their priority order with
+    create_blender_liblist from Blender.py, see the SConstruct on how
+    it is used.
+
+    The program repository is the global list program_list from
+    Blender.py. See SConstruct for its usage.
+
+
+    Adding a new option and libraries
+    ---------------------------------
+
+    Lets say we want to add WITH_BF_NEWLIB, which will
+    enable or disable a new feature library with sources in
+    $BLENDERHOME/source/blender/newlib. This 'newlib' needs external
+    headers from a 3rd party library '3rdparty'. For this we want to
+    add a set of options BF_3RDPARTY, BF_3RDPARTY_INC, BF_3RDPARTY_LIB,
+    BF_3RDPARTY_LIBPATH:
+
+        1) Add all mentiond options to all (platform)-config.py
+        files. WITH_BF_NEWLIB is a boolean option ('true', 'false'),
+        the rest are strings with paths and library names. See the
+        OpenEXR options for example.
+
+        2) Add all options to the argument checking function
+        validate_arguments() in btools.py. See again OpenEXR options
+        for example.
+
+        3) Add all options to the option reading function read_opts()
+        in btools.py. See again OpenEXR options for example. All default
+        values can be empty, as the actual default values are in the
+        (platform)-config.py files.
+
+        4) Add BF_3RDPARTY_LIB to the function setup_syslibs()
+        and BF_3RDPARTY_LIBPATH to the function setup_staticlibs()
+        in Blender.py
+
+    At this stage we have prepared all option setting and linking needs,
+    but we still need to add in the compiling of the 'newlib'.
+
+        5) Create a SConscript in $BLENDERHOME/source/blender/newlib. Look
+        at ie. $BLENDERHOME/source/blender/src/SConscript for
+        template. The new SConscript will register the new library
+        like so:
+
+            env.BlenderLib(libname='newlib', sources=sourcefiles, includes=incs) # the rest of the arguments get defaults = empty lists and values
+
+        6) Edit $BLENDERHOME/source/blender/SConscript with the following
+        addition:
+
+            if env['WITH_BF_NEWLIB'] == 1:
+                SConscript(['newlib/SConscript'])
+
+    After this you can see if this works by trying to build:
+
+            % scons WITH_BF_NEWLIB=1  # build with newlib
+            % scons WITH_BF_NEWLIB=0  # disable newlib
+
+    This is all what should be needed. Changing the library name doesn't
+    need changes elsewhere in the system, as it is handled automatically
+    with the central library repository.
+
+    Enjoy the new system!
+
+    /Nathan Letwory (jesterKing)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Campbell Barton	ea6fd84d6d	Build fix for 2.4x branch (CMake on recent Linux)	2014-10-20 09:56:43 +02:00
Campbell Barton	ea1eca85a5	fix for memory leak converting an idproperty group into a dict	2011-06-17 05:54:39 +00:00
Remigiusz Fiedler	0f1eea37f3	fixes for DXF-importer script: v1.12 - 2011.05.07 by migius h1 fixed for SPLINE: points coordinates are always in WCS h1 code beautifying v1.12 - 2010.04.29 by migius g1 preparation for non-UI-mode: import_dxf.main('dxf_file_name.dxf')	2011-05-10 00:18:36 +00:00
Campbell Barton	422cc6ac3f	fix for building with gcc4.6	2011-04-28 02:05:41 +00:00
Campbell Barton	470f124e89	backport fix from r35397	2011-03-09 03:29:12 +00:00
Campbell Barton	2662d36a50	leak fix in blender 2.4x, noticed while updating for 2.5x.	2011-02-25 02:38:19 +00:00
Campbell Barton	8c6243b508	x3d/vrml import fix for bad comparison with vertex color index.	2011-01-11 04:21:59 +00:00
Campbell Barton	e22aab98d5	pedantic pep8 correctness	2011-01-01 06:31:29 +00:00
Campbell Barton	330dbe577b	BVH Exporter, originally written by myself but exported bad rotations, Andrea Rugliancich managed to fix these this bug so the script is finally ok usable. Will port to 2.5x later.	2011-01-01 05:57:08 +00:00
Campbell Barton	5d7e15b80d	patch [#24917 ] Ipo curves of particles are not exported to python from Daniel Fiser (danfis)	2010-11-28 13:59:29 +00:00
Remigiusz Fiedler	ec2db89d1d	DXF-exporter script update: v1.37 - 2010.06.23 by migius - APPLY-MODIFIER: added exception for modifier-free instances to export them as BLOCK/INSERTs DXF-export library update: v1.35 - 2010.06.23 by migius - added (as default) writing to DXF file without RAM-buffering: faster and low-RAM-machines friendly	2010-06-23 09:14:22 +00:00
Remigiusz Fiedler	9927b361bd	DXF-exporter script update: v1.36 - 2010.06.20 by migius - added export Nurbs-Curve (3,4,5th-degree) into POLYLINE-NURBS(quad,cubic) but no support for Bezier-Curves, because DXF doesnt support them DXF-export library update: v1.34 - 2010.06.20 by migius - bugfix POLYFACE - added DXF-flags for POLYLINE and VERTEX class (NURBS-export)	2010-06-20 19:21:41 +00:00
Remigiusz Fiedler	f0b048bf3c	tiny correction for PyAPI Background Image: Windows.SetBgImage(image) function call activates background-image-mode if disabled	2010-06-08 11:09:20 +00:00
Remigiusz Fiedler	5a70fc9045	added API support for Background Image: Windows.GetBgImage(), Windows.SetBgImage(image)	2010-06-08 00:02:42 +00:00
Dalai Felinto	06f515e15e	Epydocs: Physics Constraints module: (following recent update on trunk/2.5) main functions are all here. The others are either commented as unstable in the code, or not commented at all.	2010-04-20 08:35:58 +00:00
Remigiusz Fiedler	a5e5a05fc2	DXF-importer script v1.12 - 2010.03.04 by migius - fix POLYFACE for non-standard ordered double-vertices - fix (unused)-BLOCKs-detection for non-DXFr12-conform SECTION:BLOCKS - wip-fix global relocation: culprit is blenders 1mio-Limit - fix normals for TRACE (in opposite to SOLID)	2010-03-05 03:52:05 +00:00
Campbell Barton	b7863917b7	[#20116 ] calculation problem in bvh_importer.py from Martin K (martinbk)	2010-02-21 09:35:09 +00:00
Campbell Barton	9a1cb75d01	bugfix in 2.4x also [#20480 ] crash/lock-up for certain aspect ratios	2010-02-16 16:04:38 +00:00
Campbell Barton	43fc13ed34	[#20681 ] Text beveling works incosistently when not justifying text left own error from r23101	2010-02-03 21:29:46 +00:00
Campbell Barton	c9fcaff607	fix for error spotted by Jérôme Lelong	2010-01-29 09:55:14 +00:00