22 files changed, 96 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e8b812e57c..9c14bdd6b9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ SET(BLENDER_VERSION  2.5)
 
 #-----------------------------------------------------------------------------
 # Load some macros.
-INCLUDE(CMake/macros.cmake)
+INCLUDE(build_files/cmake/macros.cmake)
 
 #-----------------------------------------------------------------------------
 # Set default config options
diff --git a/SConstruct b/SConstruct
index 26fa5b47198..09ada7d7f70 100644
--- a/SConstruct
+++ b/SConstruct
@@ -46,6 +46,9 @@ import glob
 import re
 from tempfile import mkdtemp
 
+# needed for importing tools
+sys.path.append(os.path.join(".", "build_files", "scons"))
+
 import tools.Blender
 import tools.btools
 import tools.bcolors
@@ -159,7 +162,7 @@ if crossbuild and platform not in ('win32-vc', 'win64-vc'):
 
 env['OURPLATFORM'] = platform
 
-configfile = 'config'+os.sep+platform+'-config.py'
+configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
 
 if os.path.exists(configfile):
 	print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
diff --git a/CMake/macros.cmake b/build_files/cmake/macros.cmake
index aec86f7467a..aec86f7467a 100644
--- a/CMake/macros.cmake
+++ b/build_files/cmake/macros.cmake
diff --git a/build_files/make/example_scripts/linux_nanmakefiles.sh b/build_files/make/example_scripts/linux_nanmakefiles.sh
new file mode 100755
index 00000000000..aa8d8820681
--- /dev/null
+++ b/build_files/make/example_scripts/linux_nanmakefiles.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+#
+# This is an example script to build things with the Nan Makefiles
+#
+#
+
+rm -f /tmp/.nanguess
+export MAKE=make
+export NANBLENDERHOME=`pwd`
+export MAKEFLAGS="-w -I $NANBLENDERHOME/source --no-print-directory"
+export HMAKE="$NANBLENDERHOME/source/tools/hmake/hmake"
+
+export NAN_PYTHON=/soft/python-2.2.2b1/progeny1
+export NAN_PYTHON_VERSION=2.2
+export NAN_OPENAL=/usr/local
+export NAN_JPEG=/usr/local
+export NAN_PNG=/usr/local
+export NAN_SDL=/usr/local
+export NAN_ODE=/usr/local
+export NAN_ZLIB=/usr/local
+export NAN_FREETYPE=/usr/local
+
+export NAN_MOZILLA_INC=/usr/local/include/mozilla-1.0.1/
+export NAN_MOZILLA_LIB=/usr/local/lib/mozilla-1.0.1/
+#export NAN_NSPR=/scratch/irulan/mein/nspr-4.2.2/mozilla/nsprpub/dist/
+export CPPFLAGS="$CPPFLAGS"
+export CFLAGS="$CFLAGS"
+export INTERNATIONAL=true
+
+$HMAKE -C intern/
+if [ $? -eq 0 ]; then
+        $HMAKE -C source/
+fi
+$HMAKE -C release
+
+#cd release
+#make
diff --git a/build_files/make/example_scripts/macos_nanmakefiles.sh b/build_files/make/example_scripts/macos_nanmakefiles.sh
new file mode 100755
index 00000000000..d2cce204a53
--- /dev/null
+++ b/build_files/make/example_scripts/macos_nanmakefiles.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+rm -f /tmp/.nanguess
+export MAKE=make
+export NANBLENDERHOME=`pwd`
+export MAKEFLAGS="-w -I $NANBLENDERHOME/source --no-print-directory"
+export HMAKE="$NANBLENDERHOME/source/tools/hmake/hmake"
+echo 
+echo NANBLENDERHOME : ${NANBLENDERHOME}
+
+export NAN_PYTHON=/sw
+
+$HMAKE -C intern/
+if [ $? -eq 0 ]; then
+        $HMAKE -C source/
+fi
+cd release
+make
diff --git a/build_files/make/example_scripts/sunos_nanmakefiles.sh b/build_files/make/example_scripts/sunos_nanmakefiles.sh
new file mode 100755
index 00000000000..25dd17bebb1
--- /dev/null
+++ b/build_files/make/example_scripts/sunos_nanmakefiles.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+# This is an example build script for SunOS5.8
+
+rm -f /tmp/.nanguess
+export MAKE=make
+export NANBLENDERHOME=`pwd`
+export MAKEFLAGS="-w -I $NANBLENDERHOME/source --no-print-directory"
+export HMAKE="$NANBLENDERHOME/source/tools/hmake/hmake"
+
+export NAN_PYTHON=/soft/python-2.2.2b1/SunOS5.8
+export NAN_PYTHON_VERSION=2.2
+export NAN_OPENAL=/usr/local
+export NAN_JPEG=/usr/local
+export NAN_PNG=/usr/local
+export NAN_SDL=/usr/local
+export NAN_ODE=/usr/local
+export NAN_OPENSSL=/soft/ssl/openssl-0.9.6e
+export NAN_ZLIB=/usr/local
+export NAN_FREETYPE=/usr/local
+
+export NAN_MOZILLA_INC=/usr/local/include/mozilla-1.0.1/
+export NAN_MOZILLA_LIB=/usr/local/lib/mozilla-1.0.1/
+export NAN_NSPR=/scratch/irulan/mein/nspr-4.2.2/mozilla/nsprpub/dist/
+export CPPFLAGS="$CPPFLAGS"
+export CFLAGS="$CFLAGS"
+export INTERNATIONAL=true
+
+$HMAKE -C intern/
+if [ $? -eq 0 ]; then
+        $HMAKE -C source/
+fi
+$HMAKE -C release
+
+#cd release
+#make
diff --git a/config/aix4-config.py b/build_files/scons/config/aix4-config.py
index a769f53b35e..a769f53b35e 100644
--- a/config/aix4-config.py
+++ b/build_files/scons/config/aix4-config.py
diff --git a/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index 1423e8fb392..1423e8fb392 100644
--- a/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
diff --git a/config/irix6-config.py b/build_files/scons/config/irix6-config.py
index 7c319f7b520..7c319f7b520 100644
--- a/config/irix6-config.py
+++ b/build_files/scons/config/irix6-config.py
diff --git a/config/linux2-config.py b/build_files/scons/config/linux2-config.py
index 7a350a74ed5..7a350a74ed5 100644
--- a/config/linux2-config.py
+++ b/build_files/scons/config/linux2-config.py
diff --git a/config/linuxcross-config.py b/build_files/scons/config/linuxcross-config.py
index 1650201f8c6..1650201f8c6 100644
--- a/config/linuxcross-config.py
+++ b/build_files/scons/config/linuxcross-config.py
diff --git a/config/openbsd3-config.py b/build_files/scons/config/openbsd3-config.py
index 0ef9ba5d0a4..0ef9ba5d0a4 100644
--- a/config/openbsd3-config.py
+++ b/build_files/scons/config/openbsd3-config.py
diff --git a/config/sunos5-config.py b/build_files/scons/config/sunos5-config.py
index a0713735a5b..a0713735a5b 100644
--- a/config/sunos5-config.py
+++ b/build_files/scons/config/sunos5-config.py
diff --git a/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py
index f8b67781172..f8b67781172 100644
--- a/config/win32-mingw-config.py
+++ b/build_files/scons/config/win32-mingw-config.py
diff --git a/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index ce34737fd49..ce34737fd49 100644
--- a/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
diff --git a/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index 46b9034823c..46b9034823c 100644
--- a/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
diff --git a/tools/Blender.py b/build_files/scons/tools/Blender.py
index 1195b00b39d..1195b00b39d 100644
--- a/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
diff --git a/tools/__init__.py b/build_files/scons/tools/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/tools/__init__.py
+++ b/build_files/scons/tools/__init__.py
diff --git a/tools/bcolors.py b/build_files/scons/tools/bcolors.py
index b01bb781524..b01bb781524 100644
--- a/tools/bcolors.py
+++ b/build_files/scons/tools/bcolors.py
diff --git a/tools/btools.py b/build_files/scons/tools/btools.py
index 03a1a0f0b7a..03a1a0f0b7a 100644
--- a/tools/btools.py
+++ b/build_files/scons/tools/btools.py
diff --git a/tools/crossmingw.py b/build_files/scons/tools/crossmingw.py
index f97fdf3c15e..f97fdf3c15e 100644
--- a/tools/crossmingw.py
+++ b/build_files/scons/tools/crossmingw.py
diff --git a/tools/mstoolkit.py b/build_files/scons/tools/mstoolkit.py
index 4eeefa5ed9d..4eeefa5ed9d 100644
--- a/tools/mstoolkit.py
+++ b/build_files/scons/tools/mstoolkit.py