split 'tools' directory into 'data' and 'dependencies'

SConstruct

@@ -59,11 +59,11 @@ vars.Add('MSVC_VERSION',  'MS Visual C++ compiler version')
 vars.Add('QTDIR',         'Qt installation directory')
 
 try:
-	env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt4'], toolpath=['tools'])
+	env = Environment(options=vars, ENV = os.environ, tools=['default', 'qt4'], toolpath=['data'])
 	print 'Checking for Qt 4.x... yes'
 	hasQt = True
 except Exception:
-	env = Environment(options=vars, ENV = os.environ, tools=['default'], toolpath=['tools'])
+	env = Environment(options=vars, ENV = os.environ, tools=['default'])
 	print 'Unable to detect a Qt installation -- not building the GUI!'
 	hasQt = False
 
@@ -409,7 +409,7 @@ resources = []
 darwinStub = []
 
 if sys.platform == 'win32':
-	resources += [env.RES('tools/windows/mitsuba_res.rc')]
+	resources += [env.RES('data/windows/mitsuba_res.rc')]
 
 # Build the command-line+GUI interface
 mainEnv.Program('mtssrv', resources + ['src/mitsuba/mtssrv.cpp'])
@@ -463,7 +463,7 @@ if hasQt:
 		qtEnv.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
 		qtEnv.Append(LIBS=['qtmain'])
 	elif sys.platform == 'darwin':
-		qtEnv.Append(LINKFLAGS=['-Ftools/darwin', '-framework', 'BWToolkitFramework'])
+		qtEnv.Append(LINKFLAGS=['-Fdependencies/darwin', '-framework', 'BWToolkitFramework'])
 
 	qtInterfaces = [qtEnv.Uic4(uic) for uic in scanFiles('src/qtgui', ['*.ui'])]
 	qtResources = [qtEnv.Qrc(qrc) for qrc in scanFiles('src/qtgui', ['*.qrc'])]
@@ -483,7 +483,7 @@ if hasQt:
 		qtEnv_osx['CXXFLAGS'].remove('-fstrict-aliasing');
 		qtEnv_osx['CXXFLAGS'].remove('-ftree-vectorize');
 		qtEnv_osx['CXXFLAGS'].append('-fno-strict-aliasing');
-		qtEnv_osx['CXXFLAGS'].append(['-Ftools/darwin', '-framework', 'BWToolkitFramework'])
+		qtEnv_osx['CXXFLAGS'].append(['-Fdependencies/darwin', '-framework', 'BWToolkitFramework'])
 		qtgui_files += qtEnv_osx.StaticObject('src/qtgui/previewsettingsdlg_cocoa_impl.mm')
 	else:
 		qtgui_files = [x for x in qtgui_files if (not isinstance(x, str) or 'cocoa' not in x)]
@@ -626,9 +626,9 @@ if sys.platform == 'win32':
 			installTargets += env.Install('dist/plugins', plugin)
 	installTargets += env.Install('dist/schema', 'schema/scene.xsd')
 	if 'WIN64' in env['CXXFLAGS']:
-		dllprefix='tools/windows/lib64/'
+		dllprefix='dependencies/windows/lib64/'
 	else:
-		dllprefix='tools/windows/lib32/'
+		dllprefix='dependencies/windows/lib32/'
 	installTargets += env.Install('dist', 'mitsuba.exe')
 	installTargets += env.Install('dist', 'mtssrv.exe')
 	installTargets += env.Install('dist', 'mtsutil.exe')
@@ -683,25 +683,25 @@ elif sys.platform == 'darwin':
 	installTargets += env.Install('Mitsuba.app/Contents/MacOS', 'mtsutil')
 	installTargets += env.Install('Mitsuba.app/Contents/MacOS', 'mitsuba')
 	installTargets += env.Install('Mitsuba.app/Contents/MacOS', 'mtsimport')
-	plist = env.Install('Mitsuba.app/Contents', 'tools/darwin/Info.plist')
+	plist = env.Install('Mitsuba.app/Contents', 'data/darwin/Info.plist')
 	installTargets += plist
 	installTargets += env.AddPostAction(plist, 'perl -pi -e "s/MTS_VERSION/%s/" $TARGET' % MTS_VERSION)
-	installTargets += env.Install('Mitsuba.app/Contents', 'tools/darwin/PkgInfo')
+	installTargets += env.Install('Mitsuba.app/Contents', 'data/darwin/PkgInfo')
-	installTargets += env.Install('Mitsuba.app/Contents/Resources', 'tools/darwin/Resources/mitsuba.icns')
+	installTargets += env.Install('Mitsuba.app/Contents/Resources', 'data/darwin/Resources/mitsuba.icns')
 	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'src/librender/libmitsuba-render.dylib')
 	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'src/libcore/libmitsuba-core.dylib')
 	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'src/libhw/libmitsuba-hw.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/GLEW.framework/Resources/libs/libGLEW.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/GLEW.framework/Resources/libs/libGLEW.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/OpenEXR.framework/Resources/lib/libHalf.6.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libHalf.6.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/OpenEXR.framework/Resources/lib/libIex.6.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libIex.6.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/OpenEXR.framework/Resources/lib/libImath.6.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libImath.6.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/OpenEXR.framework/Resources/lib/libIlmThread.6.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libIlmThread.6.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/OpenEXR.framework/Resources/lib/libIlmImf.6.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libIlmImf.6.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Xerces-C.framework/Resources/lib/libxerces-c-3.0.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/Xerces-C.framework/Resources/lib/libxerces-c-3.0.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libpng.framework/Resources/lib/libpng.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libpng.framework/Resources/lib/libpng.dylib')
-	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/libjpeg.framework/Resources/lib/libjpeg.dylib')
+	installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/libjpeg.framework/Resources/lib/libjpeg.dylib')
 	if hasCollada:
-		installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'tools/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib')
+		installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib')
 	if hasQt:
 		installTargets += env.Install('Mitsuba.app/Contents/MacOS', 'mtsgui')
 		installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', '/Library/Frameworks/QtCore.framework/Versions/4/QtCore')
@@ -715,20 +715,20 @@ elif sys.platform == 'darwin':
 		installTargets += env.AddPostAction(opengl, 'install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore $TARGET')
 		installTargets += env.AddPostAction(opengl, 'install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui $TARGET')
 		installTargets += env.Install('Mitsuba.app/Contents/Resources', '/Library/Frameworks//QtGui.framework/Versions/4/Resources/qt_menu.nib')
-		installTargets += env.Install('Mitsuba.app/Contents/Resources/PreviewSettings.nib', 'tools/darwin/PreviewSettings.nib/designable.nib')
+		installTargets += env.Install('Mitsuba.app/Contents/Resources/PreviewSettings.nib', 'data/darwin/PreviewSettings.nib/designable.nib')
-		installTargets += env.Install('Mitsuba.app/Contents/Resources/PreviewSettings.nib', 'tools/darwin/PreviewSettings.nib/keyedobjects.nib')
+		installTargets += env.Install('Mitsuba.app/Contents/Resources/PreviewSettings.nib', 'data/darwin/PreviewSettings.nib/keyedobjects.nib')
-		installTargets += env.Install('Mitsuba.app/Contents/Resources', 'tools/darwin/qt.conf')
+		installTargets += env.Install('Mitsuba.app/Contents/Resources', 'data/darwin/qt.conf')
-		installTargets += env.Install('Mitsuba.app/Contents/Frameworks/BWToolkitFramework.framework/Versions/A', 'tools/darwin/BWToolkitFramework.framework/Versions/A/BWToolkitFramework')
+		installTargets += env.Install('Mitsuba.app/Contents/Frameworks/BWToolkitFramework.framework/Versions/A', 'dependencies/darwin/BWToolkitFramework.framework/Versions/A/BWToolkitFramework')
-		for file in os.listdir('tools/darwin/BWToolkitFramework.framework/Versions/A/Resources'):
+		for file in os.listdir('dependencies/darwin/BWToolkitFramework.framework/Versions/A/Resources'):
 			if fnmatch.fnmatch(file, '*.pdf') or fnmatch.fnmatch(file, '*.tiff') or fnmatch.fnmatch(file, '*.tif') or fnmatch.fnmatch(file, '*.png') or fnmatch.fnmatch(file, '*.rtf') or fnmatch.fnmatch(file, '*.plist'):
-				installTargets += env.Install('Mitsuba.app/Contents/Frameworks/BWToolkitFramework.framework/Resources', 'tools/darwin/BWToolkitFramework.framework/Versions/A/Resources/' + file)
+				installTargets += env.Install('Mitsuba.app/Contents/Frameworks/BWToolkitFramework.framework/Resources', 'dependencies/darwin/BWToolkitFramework.framework/Versions/A/Resources/' + file)
 
 if dist:
 	if sys.platform == 'win32':
-		distTarget = env.Command("Mitsuba %s.zip" % MTS_VERSION, [], "tools\\windows\\build-dist.bat %s" % MTS_VERSION)
+		distTarget = env.Command("Mitsuba %s.zip" % MTS_VERSION, [], "data\\windows\\build-dist.bat %s" % MTS_VERSION)
 		Depends(distTarget, installTargets)
 	elif sys.platform == 'darwin':
-		distTarget = env.Command("Mitsuba %s.dmg" % MTS_VERSION, [], "tools/darwin/build-dmg.sh %s" % MTS_VERSION)
+		distTarget = env.Command("Mitsuba %s.dmg" % MTS_VERSION, [], "data/darwin/build-dmg.sh %s" % MTS_VERSION)
 		Depends(distTarget, installTargets)
 	elif sys.platform == 'linux2':
-		env.Command("mitsuba-%s.tar.gz" % MTS_VERSION, [], "tools/linux/build-sourcedist.sh %s" % MTS_VERSION)
+		env.Command("mitsuba-%s.tar.gz" % MTS_VERSION, [], "data/linux/build-sourcedist.sh %s" % MTS_VERSION)

config/config-darwin-universal.py

@@ -3,25 +3,25 @@ CXXFLAGS       = ['-arch', 'i386', '-arch', 'x86_64', '-mmacosx-version-min=10.5
 LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'i386', '-arch', 'x86_64', '-mmacosx-version-min=10.5', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk']
 BASEINCLUDE    = ['#include']
 BASELIB        = ['m', 'pthread', 'gomp']
-OEXRINCLUDE    = ['#tools/darwin/OpenEXR.framework/Headers/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR']
-OEXRLIBDIR     = ['#tools/darwin/OpenEXR.framework/Resources/lib']
+OEXRLIBDIR     = ['#dependencies/darwin/OpenEXR.framework/Resources/lib']
 OEXRLIB        = ['Half', 'IlmImf', 'Iex', 'Imath', 'z']
-PNGINCLUDE     = ['#tools/darwin/libpng.framework/Headers']
+PNGINCLUDE     = ['#dependencies/darwin/libpng.framework/Headers']
-PNGLIBDIR      = ['#tools/darwin/libpng.framework/Resources/lib']
+PNGLIBDIR      = ['#dependencies/darwin/libpng.framework/Resources/lib']
 PNGLIB         = ['png']
-JPEGINCLUDE    = ['#tools/darwin/libjpeg.framework/Headers']
+JPEGINCLUDE    = ['#dependencies/darwin/libjpeg.framework/Headers']
-JPEGLIBDIR     = ['#tools/darwin/libjpeg.framework/Resources/lib']
+JPEGLIBDIR     = ['#dependencies/darwin/libjpeg.framework/Resources/lib']
 JPEGLIB        = ['jpeg']
-XERCESINCLUDE  = ['#tools/darwin/Xerces-C.framework/Headers']
+XERCESINCLUDE  = ['#dependencies/darwin/Xerces-C.framework/Headers']
-XERCESLIBDIR   = ['#tools/darwin/Xerces-C.framework/Resources/lib']
+XERCESLIBDIR   = ['#dependencies/darwin/Xerces-C.framework/Resources/lib']
 XERCESLIB      = ['xerces-c']
-GLINCLUDE      = ['#tools/darwin/GLEW.framework/Headers']
+GLINCLUDE      = ['#dependencies/darwin/GLEW.framework/Headers']
-GLLIBDIR       = ['#tools/darwin/GLEW.framework/Resources/libs']
+GLLIBDIR       = ['#dependencies/darwin/GLEW.framework/Resources/libs']
 GLLIB          = ['GLEW', 'objc']
 GLFLAGS        = ['-DGLEW_MX']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies/boost']
 BOOSTLIB       = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39']
-BOOSTLIBDIR    = ['tools/darwin/libboost.framework/Resources/lib']
+BOOSTLIBDIR    = ['dependencies/darwin/libboost.framework/Resources/lib']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libCollada14Dom']
-COLLADALIBDIR  = ['#tools/darwin/Collada14Dom.framework/Resources/lib']
+COLLADALIBDIR  = ['#dependencies/darwin/Collada14Dom.framework/Resources/lib']

config/config-darwin-x86.py

@@ -3,25 +3,25 @@ CXXFLAGS       = ['-arch', 'i386', '-mmacosx-version-min=10.5', '-march=nocona',
 LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'i386', '-mmacosx-version-min=10.5', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk']
 BASEINCLUDE    = ['#include']
 BASELIB        = ['m', 'pthread', 'gomp']
-OEXRINCLUDE    = ['#tools/darwin/OpenEXR.framework/Headers/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR']
-OEXRLIBDIR     = ['#tools/darwin/OpenEXR.framework/Resources/lib']
+OEXRLIBDIR     = ['#dependencies/darwin/OpenEXR.framework/Resources/lib']
 OEXRLIB        = ['Half', 'IlmImf', 'Iex', 'Imath', 'z']
-PNGINCLUDE     = ['#tools/darwin/libpng.framework/Headers']
+PNGINCLUDE     = ['#dependencies/darwin/libpng.framework/Headers']
-PNGLIBDIR      = ['#tools/darwin/libpng.framework/Resources/lib']
+PNGLIBDIR      = ['#dependencies/darwin/libpng.framework/Resources/lib']
 PNGLIB         = ['png']
-JPEGINCLUDE    = ['#tools/darwin/libjpeg.framework/Headers']
+JPEGINCLUDE    = ['#dependencies/darwin/libjpeg.framework/Headers']
-JPEGLIBDIR     = ['#tools/darwin/libjpeg.framework/Resources/lib']
+JPEGLIBDIR     = ['#dependencies/darwin/libjpeg.framework/Resources/lib']
 JPEGLIB        = ['jpeg']
-XERCESINCLUDE  = ['#tools/darwin/Xerces-C.framework/Headers']
+XERCESINCLUDE  = ['#dependencies/darwin/Xerces-C.framework/Headers']
-XERCESLIBDIR   = ['#tools/darwin/Xerces-C.framework/Resources/lib']
+XERCESLIBDIR   = ['#dependencies/darwin/Xerces-C.framework/Resources/lib']
 XERCESLIB      = ['xerces-c']
-GLINCLUDE      = ['#tools/darwin/GLEW.framework/Headers']
+GLINCLUDE      = ['#dependencies/darwin/GLEW.framework/Headers']
-GLLIBDIR       = ['#tools/darwin/GLEW.framework/Resources/libs']
+GLLIBDIR       = ['#dependencies/darwin/GLEW.framework/Resources/libs']
 GLLIB          = ['GLEW', 'objc']
 GLFLAGS        = ['-DGLEW_MX']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies/boost']
 BOOSTLIB       = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39']
-BOOSTLIBDIR    = ['tools/darwin/libboost.framework/Resources/lib']
+BOOSTLIBDIR    = ['dependencies/darwin/libboost.framework/Resources/lib']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libCollada14Dom']
-COLLADALIBDIR  = ['#tools/darwin/Collada14Dom.framework/Resources/lib']
+COLLADALIBDIR  = ['#dependencies/darwin/Collada14Dom.framework/Resources/lib']

config/config-darwin-x86_64.py

@@ -3,25 +3,25 @@ CXXFLAGS       = ['-arch', 'x86_64', '-mmacosx-version-min=10.5', '-march=nocona
 LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'x86_64', '-mmacosx-version-min=10.5', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk']
 BASEINCLUDE    = ['#include']
 BASELIB        = ['m', 'pthread', 'gomp']
-OEXRINCLUDE    = ['#tools/darwin/OpenEXR.framework/Headers/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR']
-OEXRLIBDIR     = ['#tools/darwin/OpenEXR.framework/Resources/lib']
+OEXRLIBDIR     = ['#dependencies/darwin/OpenEXR.framework/Resources/lib']
 OEXRLIB        = ['Half', 'IlmImf', 'Iex', 'Imath', 'z']
-PNGINCLUDE     = ['#tools/darwin/libpng.framework/Headers']
+PNGINCLUDE     = ['#dependencies/darwin/libpng.framework/Headers']
-PNGLIBDIR      = ['#tools/darwin/libpng.framework/Resources/lib']
+PNGLIBDIR      = ['#dependencies/darwin/libpng.framework/Resources/lib']
 PNGLIB         = ['png']
-JPEGINCLUDE    = ['#tools/darwin/libjpeg.framework/Headers']
+JPEGINCLUDE    = ['#dependencies/darwin/libjpeg.framework/Headers']
-JPEGLIBDIR     = ['#tools/darwin/libjpeg.framework/Resources/lib']
+JPEGLIBDIR     = ['#dependencies/darwin/libjpeg.framework/Resources/lib']
 JPEGLIB        = ['jpeg']
-XERCESINCLUDE  = ['#tools/darwin/Xerces-C.framework/Headers']
+XERCESINCLUDE  = ['#dependencies/darwin/Xerces-C.framework/Headers']
-XERCESLIBDIR   = ['#tools/darwin/Xerces-C.framework/Resources/lib']
+XERCESLIBDIR   = ['#dependencies/darwin/Xerces-C.framework/Resources/lib']
 XERCESLIB      = ['xerces-c']
-GLINCLUDE      = ['#tools/darwin/GLEW.framework/Headers']
+GLINCLUDE      = ['#dependencies/darwin/GLEW.framework/Headers']
-GLLIBDIR       = ['#tools/darwin/GLEW.framework/Resources/libs']
+GLLIBDIR       = ['#dependencies/darwin/GLEW.framework/Resources/libs']
 GLLIB          = ['GLEW', 'objc']
 GLFLAGS        = ['-DGLEW_MX']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies/boost']
 BOOSTLIB       = ['boost_filesystem-xgcc42-mt-1_39', 'boost_system-xgcc42-mt-1_39']
-BOOSTLIBDIR    = ['tools/darwin/libboost.framework/Resources/lib']
+BOOSTLIBDIR    = ['dependencies/darwin/libboost.framework/Resources/lib']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libCollada14Dom']
-COLLADALIBDIR  = ['#tools/darwin/Collada14Dom.framework/Resources/lib']
+COLLADALIBDIR  = ['#dependencies/darwin/Collada14Dom.framework/Resources/lib']

config/config-icl11-win32.py

@@ -0,0 +1,26 @@
+CXX            = 'icl'
+GCC            = 'icl'
+CXXFLAGS       = ['/nologo', '/O3', '/Qipo', '/QxSSSE3', '/QaxSSE4.2,SSE4.1', '/fp:fast=2', '/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp']
+SHCXXFLAGS     = CXXFLAGS
+TARGET_ARCH    = 'x86'
+MSVC_VERSION   = '9.0'
+LINK           = 'xilink'
+LINKFLAGS      = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X86', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/NODEFAULTLIB:LIBCMT']
+BASEINCLUDE    = ['#include', '#dependencies/windows/include']
+BASELIB        = ['pthreadVCE2', 'msvcrt', 'ws2_32', 'libmmds']
+OEXRINCLUDE    = ['#dependencies/windows/include/OpenEXR']
+OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
+OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
+BOOSTINCLUDE   = ['#dependencies']
+BOOSTLIB       = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
+COLLADALIB     = ['libcollada14dom21']
+XERCESLIB      = ['xerces-c_3']
+PNGLIB         = ['libpng13']
+JPEGLIB        = ['jpeg62']
+GLLIB          = ['opengl32', 'glu32', 'glew32mx', 'gdi32', 'user32']
+GLFLAGS        = ['/D', 'GLEW_MX']
+BASELIBDIR     = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc90']
+SHLIBPREFIX    = 'lib'
+SHLIBSUFFIX    = '.dll'
+PROGSUFFIX     = '.exe'

config/config-icl11-win64.py

@@ -6,22 +6,22 @@ TARGET_ARCH    = 'x86_64'
 MSVC_VERSION   = '9.0'
 LINK           = 'xilink'
 LINKFLAGS      = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/NODEFAULTLIB:LIBCMT']
-BASEINCLUDE    = ['#include', '#tools/windows/include']
+BASEINCLUDE    = ['#include', '#dependencies/windows/include']
 BASELIB        = ['pthreadVCE2', 'msvcrt', 'ws2_32', 'libmmds']
 QTDIR          = 'C:\\Qt64'
-OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies']
-BOOSTLIB       = ['boost_system-iw-mt-1_44', 'boost_filesystem-iw-mt-1_44']
+BOOSTLIB       = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
 PNGLIB         = ['libpng13']
 JPEGLIB        = ['jpeg62']
 GLLIB          = ['opengl32', 'glu32', 'glew32mx', 'gdi32', 'user32']
 GLFLAGS        = ['/D', 'GLEW_MX']
-BASELIBDIR     = ['#tools/windows/lib64', '#tools/windows/lib64/vc90']
+BASELIBDIR     = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc90']
 SHLIBPREFIX    = 'lib'
 SHLIBSUFFIX    = '.dll'
 PROGSUFFIX     = '.exe'

config/config-msvc2008-win32.py

@@ -8,21 +8,21 @@ SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86'
 MSVC_VERSION   = '9.0'
 LINKFLAGS      = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X86', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT']
-BASEINCLUDE    = ['#include', '#tools/windows/include']
+BASEINCLUDE    = ['#include', '#dependencies/windows/include']
 BASELIB        = ['pthreadVCE2', 'msvcrt', 'ws2_32']
-OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies']
 BOOSTLIB       = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
 PNGLIB         = ['libpng13']
 JPEGLIB        = ['jpeg62']
 GLLIB          = ['opengl32', 'glu32', 'glew32mx', 'gdi32', 'user32']
 GLFLAGS        = ['/D', 'GLEW_MX']
-BASELIBDIR     = ['#tools/windows/lib32', '#tools/windows/lib32/vc90']
+BASELIBDIR     = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc90']
 SHLIBPREFIX    = 'lib'
 SHLIBSUFFIX    = '.dll'
 PROGSUFFIX     = '.exe'

config/config-msvc2008-win64.py

@@ -8,22 +8,22 @@ SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86_64'
 MSVC_VERSION   = '9.0'
 LINKFLAGS      = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT']
-BASEINCLUDE    = ['#include', '#tools/windows/include']
+BASEINCLUDE    = ['#include', '#dependencies/windows/include']
 BASELIB        = ['pthreadVCE2', 'msvcrt', 'ws2_32']
 QTDIR          = 'C:\\Qt64'
-OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies']
 BOOSTLIB       = ['boost_system-vc90-mt-1_44', 'boost_filesystem-vc90-mt-1_44']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
 PNGLIB         = ['libpng13']
 JPEGLIB        = ['jpeg62']
 GLLIB          = ['opengl32', 'glu32', 'glew32mx', 'gdi32', 'user32']
 GLFLAGS        = ['/D', 'GLEW_MX']
-BASELIBDIR     = ['#tools/windows/lib64', '#tools/windows/lib64/vc90']
+BASELIBDIR     = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc90']
 SHLIBPREFIX    = 'lib'
 SHLIBSUFFIX    = '.dll'
 PROGSUFFIX     = '.exe'

config/config-msvc2010-win32.py

@@ -8,21 +8,21 @@ SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86'
 MSVC_VERSION   = '10.0'
 LINKFLAGS      = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X86', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT']
-BASEINCLUDE    = ['#include', '#tools/windows/include']
+BASEINCLUDE    = ['#include', '#dependencies/windows/include']
 BASELIB        = ['pthreadVCE2', 'msvcrt', 'ws2_32']
-OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies']
 BOOSTLIB       = ['boost_system-vc100-mt-1_44', 'boost_filesystem-vc100-mt-1_44']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
 PNGLIB         = ['libpng13']
 JPEGLIB        = ['jpeg62']
 GLLIB          = ['opengl32', 'glu32', 'glew32mx', 'gdi32', 'user32']
 GLFLAGS        = ['/D', 'GLEW_MX']
-BASELIBDIR     = ['#tools/windows/lib32', '#tools/windows/lib32/vc100']
+BASELIBDIR     = ['#dependencies/windows/lib32', '#dependencies/windows/lib32/vc100']
 SHLIBPREFIX    = 'lib'
 SHLIBSUFFIX    = '.dll'
 PROGSUFFIX     = '.exe'

config/config-msvc2010-win64.py

@@ -8,22 +8,22 @@ SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86_64'
 MSVC_VERSION   = '10.0'
 LINKFLAGS      = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT']
-BASEINCLUDE    = ['#include', '#tools/windows/include']
+BASEINCLUDE    = ['#include', '#dependencies/windows/include']
 BASELIB        = ['pthreadVCE2', 'msvcrt', 'ws2_32']
 QTDIR          = 'C:\\Qt64'
-OEXRINCLUDE    = ['#tools/windows/include/OpenEXR']
+OEXRINCLUDE    = ['#dependencies/windows/include/OpenEXR']
 OEXRFLAGS      = ['/D', 'OPENEXR_DLL']
 OEXRLIB        = ['IlmImf', 'IlmThread', 'Iex', 'zlib1', 'Half']
-BOOSTINCLUDE   = ['#tools/boost']
+BOOSTINCLUDE   = ['#dependencies']
 BOOSTLIB       = ['boost_system-vc100-mt-1_44', 'boost_filesystem-vc100-mt-1_44']
-COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4']
+COLLADAINCLUDE = ['#dependencies/windows/include/colladadom', '#dependencies/windows/include/colladadom/1.4']
 COLLADALIB     = ['libcollada14dom21']
 XERCESLIB      = ['xerces-c_3']
 PNGLIB         = ['libpng13']
 JPEGLIB        = ['jpeg62']
 GLLIB          = ['opengl32', 'glu32', 'glew32mx', 'gdi32', 'user32']
 GLFLAGS        = ['/D', 'GLEW_MX']
-BASELIBDIR     = ['#tools/windows/lib64', '#tools/windows/lib64/vc100']
+BASELIBDIR     = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc100']
 SHLIBPREFIX    = 'lib'
 SHLIBSUFFIX    = '.dll'
 PROGSUFFIX     = '.exe'