From ea650dc287d2e8edcf811d6b9111b0cb800f6664 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Sat, 20 Nov 2010 10:03:10 -0800 Subject: [PATCH] split 'tools' directory into 'data' and 'dependencies' --- SConstruct | 58 +++++++++--------- config/config-darwin-universal.py | 28 ++++----- config/config-darwin-x86.py | 28 ++++----- config/config-darwin-x86_64.py | 28 ++++----- config/config-icl11-win32.py | 26 ++++++++ config/config-icl11-win64.py | 12 ++-- config/config-msvc2008-win32.py | 10 +-- config/config-msvc2008-win64.py | 10 +-- config/config-msvc2010-win32.py | 10 +-- config/config-msvc2010-win64.py | 10 +-- {tools => data}/blender/mitsuba/__init__.py | 0 .../blender/mitsuba/core/__init__.py | 0 .../blender/mitsuba/export/__init__.py | 0 .../blender/mitsuba/export/adjustments.py | 0 .../blender/mitsuba/export/film.py | 0 .../blender/mitsuba/matpreview/envmap.exr | Bin .../mitsuba/matpreview/matpreview.serialized | Bin .../blender/mitsuba/matpreview/matpreview.xml | 0 .../blender/mitsuba/operators/__init__.py | 0 .../blender/mitsuba/outputs/__init__.py | 0 .../blender/mitsuba/properties/__init__.py | 0 .../blender/mitsuba/properties/engine.py | 0 .../blender/mitsuba/properties/integrator.py | 0 .../blender/mitsuba/properties/lamp.py | 0 .../blender/mitsuba/properties/material.py | 0 .../blender/mitsuba/properties/sampler.py | 0 .../blender/mitsuba/properties/texture.py | 0 {tools => data}/blender/mitsuba/readme.txt | 0 {tools => data}/blender/mitsuba/render.py | 0 .../blender/mitsuba/ui/__init__.py | 0 {tools => data}/blender/mitsuba/ui/lamps.py | 0 .../blender/mitsuba/ui/materials/__init__.py | 0 .../blender/mitsuba/ui/materials/composite.py | 0 .../mitsuba/ui/materials/dielectric.py | 0 .../blender/mitsuba/ui/materials/difftrans.py | 0 .../blender/mitsuba/ui/materials/emission.py | 0 .../mitsuba/ui/materials/lambertian.py | 0 .../blender/mitsuba/ui/materials/main.py | 0 .../mitsuba/ui/materials/microfacet.py | 0 .../blender/mitsuba/ui/materials/mirror.py | 0 .../blender/mitsuba/ui/materials/phong.py | 0 .../mitsuba/ui/materials/roughglass.py | 0 .../mitsuba/ui/materials/roughmetal.py | 0 .../blender/mitsuba/ui/materials/ward.py | 0 .../blender/mitsuba/ui/render_panels.py | 0 .../blender/mitsuba/ui/textures/__init__.py | 0 .../mitsuba/ui/textures/checkerboard.py | 0 .../mitsuba/ui/textures/gridtexture.py | 0 .../blender/mitsuba/ui/textures/ldrtexture.py | 0 .../blender/mitsuba/ui/textures/main.py | 0 .../blender/mitsuba/ui/textures/mapping.py | 0 {tools => data}/darwin/Info.plist | 0 .../darwin/Mitsuba.dmgCanvas/Disk Image | Bin .../Mitsuba.dmgCanvas/QuickLook/Preview.jpg | Bin {tools => data}/darwin/PkgInfo | 0 .../darwin/PreviewSettings.nib/designable.nib | 0 .../PreviewSettings.nib/keyedobjects.nib | Bin {tools => data}/darwin/Resources/mitsuba.icns | Bin {tools => data}/darwin/build-dmg.sh | 0 {tools => data}/darwin/qt.conf | 0 {tools => data}/linux/build-sourcedist.sh | 0 {tools => data}/linux/debian/changelog | 0 {tools => data}/linux/debian/compat | 0 {tools => data}/linux/debian/control | 0 {tools => data}/linux/debian/copyright | 0 .../linux/debian/mitsuba-dev.install | 0 {tools => data}/linux/debian/mitsuba.install | 0 {tools => data}/linux/debian/rules | 0 {tools => data}/linux/fontgen/Makefile | 0 {tools => data}/linux/fontgen/Vera.ttf | Bin {tools => data}/linux/fontgen/VeraMono.ttf | Bin {tools => data}/linux/fontgen/bin2c.c | 0 {tools => data}/linux/fontgen/fontgen.cpp | 0 {tools => data}/linux/fontgen/gen.sh | 0 {tools => data}/linux/mitsuba.desktop | 0 {tools => data}/linux/nvidia.supp | 0 {tools => data}/plugin-starter-kit/README | 0 {tools => data}/plugin-starter-kit/SConstruct | 0 {tools => data}/plugin-starter-kit/myutil.cpp | 0 {tools => data}/qt4.py | 0 {tools => data}/tests/bunny.ply | Bin {tools => data}/windows/build-dist.bat | 0 {tools => data}/windows/mitsuba.ico | Bin {tools => data}/windows/mitsuba_res.rc | 0 84 files changed, 123 insertions(+), 97 deletions(-) create mode 100644 config/config-icl11-win32.py rename {tools => data}/blender/mitsuba/__init__.py (100%) rename {tools => data}/blender/mitsuba/core/__init__.py (100%) rename {tools => data}/blender/mitsuba/export/__init__.py (100%) rename {tools => data}/blender/mitsuba/export/adjustments.py (100%) rename {tools => data}/blender/mitsuba/export/film.py (100%) rename {tools => data}/blender/mitsuba/matpreview/envmap.exr (100%) rename {tools => data}/blender/mitsuba/matpreview/matpreview.serialized (100%) rename {tools => data}/blender/mitsuba/matpreview/matpreview.xml (100%) rename {tools => data}/blender/mitsuba/operators/__init__.py (100%) rename {tools => data}/blender/mitsuba/outputs/__init__.py (100%) rename {tools => data}/blender/mitsuba/properties/__init__.py (100%) rename {tools => data}/blender/mitsuba/properties/engine.py (100%) rename {tools => data}/blender/mitsuba/properties/integrator.py (100%) rename {tools => data}/blender/mitsuba/properties/lamp.py (100%) rename {tools => data}/blender/mitsuba/properties/material.py (100%) rename {tools => data}/blender/mitsuba/properties/sampler.py (100%) rename {tools => data}/blender/mitsuba/properties/texture.py (100%) rename {tools => data}/blender/mitsuba/readme.txt (100%) rename {tools => data}/blender/mitsuba/render.py (100%) rename {tools => data}/blender/mitsuba/ui/__init__.py (100%) rename {tools => data}/blender/mitsuba/ui/lamps.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/__init__.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/composite.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/dielectric.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/difftrans.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/emission.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/lambertian.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/main.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/microfacet.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/mirror.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/phong.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/roughglass.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/roughmetal.py (100%) rename {tools => data}/blender/mitsuba/ui/materials/ward.py (100%) rename {tools => data}/blender/mitsuba/ui/render_panels.py (100%) rename {tools => data}/blender/mitsuba/ui/textures/__init__.py (100%) rename {tools => data}/blender/mitsuba/ui/textures/checkerboard.py (100%) rename {tools => data}/blender/mitsuba/ui/textures/gridtexture.py (100%) rename {tools => data}/blender/mitsuba/ui/textures/ldrtexture.py (100%) rename {tools => data}/blender/mitsuba/ui/textures/main.py (100%) rename {tools => data}/blender/mitsuba/ui/textures/mapping.py (100%) rename {tools => data}/darwin/Info.plist (100%) rename {tools => data}/darwin/Mitsuba.dmgCanvas/Disk Image (100%) rename {tools => data}/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg (100%) rename {tools => data}/darwin/PkgInfo (100%) rename {tools => data}/darwin/PreviewSettings.nib/designable.nib (100%) rename {tools => data}/darwin/PreviewSettings.nib/keyedobjects.nib (100%) rename {tools => data}/darwin/Resources/mitsuba.icns (100%) rename {tools => data}/darwin/build-dmg.sh (100%) rename {tools => data}/darwin/qt.conf (100%) rename {tools => data}/linux/build-sourcedist.sh (100%) rename {tools => data}/linux/debian/changelog (100%) rename {tools => data}/linux/debian/compat (100%) rename {tools => data}/linux/debian/control (100%) rename {tools => data}/linux/debian/copyright (100%) rename {tools => data}/linux/debian/mitsuba-dev.install (100%) rename {tools => data}/linux/debian/mitsuba.install (100%) rename {tools => data}/linux/debian/rules (100%) rename {tools => data}/linux/fontgen/Makefile (100%) rename {tools => data}/linux/fontgen/Vera.ttf (100%) rename {tools => data}/linux/fontgen/VeraMono.ttf (100%) rename {tools => data}/linux/fontgen/bin2c.c (100%) rename {tools => data}/linux/fontgen/fontgen.cpp (100%) rename {tools => data}/linux/fontgen/gen.sh (100%) rename {tools => data}/linux/mitsuba.desktop (100%) rename {tools => data}/linux/nvidia.supp (100%) rename {tools => data}/plugin-starter-kit/README (100%) rename {tools => data}/plugin-starter-kit/SConstruct (100%) rename {tools => data}/plugin-starter-kit/myutil.cpp (100%) rename {tools => data}/qt4.py (100%) rename {tools => data}/tests/bunny.ply (100%) rename {tools => data}/windows/build-dist.bat (100%) rename {tools => data}/windows/mitsuba.ico (100%) rename {tools => data}/windows/mitsuba_res.rc (100%) diff --git a/SConstruct b/SConstruct index 1912d427..7550f90e 100644 --- a/SConstruct +++ b/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/Resources', 'tools/darwin/Resources/mitsuba.icns') + installTargets += env.Install('Mitsuba.app/Contents', 'data/darwin/PkgInfo') + 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', 'tools/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', 'tools/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', 'tools/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', 'tools/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/GLEW.framework/Resources/libs/libGLEW.dylib') + installTargets += env.OSXLibInst('Mitsuba.app/Contents/Frameworks', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libHalf.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', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libImath.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', 'dependencies/darwin/OpenEXR.framework/Resources/lib/libIlmImf.6.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', 'dependencies/darwin/libpng.framework/Resources/lib/libpng.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', 'tools/darwin/PreviewSettings.nib/keyedobjects.nib') - installTargets += env.Install('Mitsuba.app/Contents/Resources', 'tools/darwin/qt.conf') - installTargets += env.Install('Mitsuba.app/Contents/Frameworks/BWToolkitFramework.framework/Versions/A', 'tools/darwin/BWToolkitFramework.framework/Versions/A/BWToolkitFramework') - for file in os.listdir('tools/darwin/BWToolkitFramework.framework/Versions/A/Resources'): + installTargets += env.Install('Mitsuba.app/Contents/Resources/PreviewSettings.nib', 'data/darwin/PreviewSettings.nib/designable.nib') + installTargets += env.Install('Mitsuba.app/Contents/Resources/PreviewSettings.nib', 'data/darwin/PreviewSettings.nib/keyedobjects.nib') + installTargets += env.Install('Mitsuba.app/Contents/Resources', 'data/darwin/qt.conf') + installTargets += env.Install('Mitsuba.app/Contents/Frameworks/BWToolkitFramework.framework/Versions/A', 'dependencies/darwin/BWToolkitFramework.framework/Versions/A/BWToolkitFramework') + 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) diff --git a/config/config-darwin-universal.py b/config/config-darwin-universal.py index 6c3f73be..5a91a991 100644 --- a/config/config-darwin-universal.py +++ b/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'] -OEXRLIBDIR = ['#tools/darwin/OpenEXR.framework/Resources/lib'] +OEXRINCLUDE = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR'] +OEXRLIBDIR = ['#dependencies/darwin/OpenEXR.framework/Resources/lib'] OEXRLIB = ['Half', 'IlmImf', 'Iex', 'Imath', 'z'] -PNGINCLUDE = ['#tools/darwin/libpng.framework/Headers'] -PNGLIBDIR = ['#tools/darwin/libpng.framework/Resources/lib'] +PNGINCLUDE = ['#dependencies/darwin/libpng.framework/Headers'] +PNGLIBDIR = ['#dependencies/darwin/libpng.framework/Resources/lib'] PNGLIB = ['png'] -JPEGINCLUDE = ['#tools/darwin/libjpeg.framework/Headers'] -JPEGLIBDIR = ['#tools/darwin/libjpeg.framework/Resources/lib'] +JPEGINCLUDE = ['#dependencies/darwin/libjpeg.framework/Headers'] +JPEGLIBDIR = ['#dependencies/darwin/libjpeg.framework/Resources/lib'] JPEGLIB = ['jpeg'] -XERCESINCLUDE = ['#tools/darwin/Xerces-C.framework/Headers'] -XERCESLIBDIR = ['#tools/darwin/Xerces-C.framework/Resources/lib'] +XERCESINCLUDE = ['#dependencies/darwin/Xerces-C.framework/Headers'] +XERCESLIBDIR = ['#dependencies/darwin/Xerces-C.framework/Resources/lib'] XERCESLIB = ['xerces-c'] -GLINCLUDE = ['#tools/darwin/GLEW.framework/Headers'] -GLLIBDIR = ['#tools/darwin/GLEW.framework/Resources/libs'] +GLINCLUDE = ['#dependencies/darwin/GLEW.framework/Headers'] +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'] -COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] +BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib'] +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'] diff --git a/config/config-darwin-x86.py b/config/config-darwin-x86.py index e7947c55..6f363bad 100644 --- a/config/config-darwin-x86.py +++ b/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'] -OEXRLIBDIR = ['#tools/darwin/OpenEXR.framework/Resources/lib'] +OEXRINCLUDE = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR'] +OEXRLIBDIR = ['#dependencies/darwin/OpenEXR.framework/Resources/lib'] OEXRLIB = ['Half', 'IlmImf', 'Iex', 'Imath', 'z'] -PNGINCLUDE = ['#tools/darwin/libpng.framework/Headers'] -PNGLIBDIR = ['#tools/darwin/libpng.framework/Resources/lib'] +PNGINCLUDE = ['#dependencies/darwin/libpng.framework/Headers'] +PNGLIBDIR = ['#dependencies/darwin/libpng.framework/Resources/lib'] PNGLIB = ['png'] -JPEGINCLUDE = ['#tools/darwin/libjpeg.framework/Headers'] -JPEGLIBDIR = ['#tools/darwin/libjpeg.framework/Resources/lib'] +JPEGINCLUDE = ['#dependencies/darwin/libjpeg.framework/Headers'] +JPEGLIBDIR = ['#dependencies/darwin/libjpeg.framework/Resources/lib'] JPEGLIB = ['jpeg'] -XERCESINCLUDE = ['#tools/darwin/Xerces-C.framework/Headers'] -XERCESLIBDIR = ['#tools/darwin/Xerces-C.framework/Resources/lib'] +XERCESINCLUDE = ['#dependencies/darwin/Xerces-C.framework/Headers'] +XERCESLIBDIR = ['#dependencies/darwin/Xerces-C.framework/Resources/lib'] XERCESLIB = ['xerces-c'] -GLINCLUDE = ['#tools/darwin/GLEW.framework/Headers'] -GLLIBDIR = ['#tools/darwin/GLEW.framework/Resources/libs'] +GLINCLUDE = ['#dependencies/darwin/GLEW.framework/Headers'] +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'] -COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] +BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib'] +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'] diff --git a/config/config-darwin-x86_64.py b/config/config-darwin-x86_64.py index 29f2ff86..390852fe 100644 --- a/config/config-darwin-x86_64.py +++ b/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'] -OEXRLIBDIR = ['#tools/darwin/OpenEXR.framework/Resources/lib'] +OEXRINCLUDE = ['#dependencies/darwin/OpenEXR.framework/Headers/OpenEXR'] +OEXRLIBDIR = ['#dependencies/darwin/OpenEXR.framework/Resources/lib'] OEXRLIB = ['Half', 'IlmImf', 'Iex', 'Imath', 'z'] -PNGINCLUDE = ['#tools/darwin/libpng.framework/Headers'] -PNGLIBDIR = ['#tools/darwin/libpng.framework/Resources/lib'] +PNGINCLUDE = ['#dependencies/darwin/libpng.framework/Headers'] +PNGLIBDIR = ['#dependencies/darwin/libpng.framework/Resources/lib'] PNGLIB = ['png'] -JPEGINCLUDE = ['#tools/darwin/libjpeg.framework/Headers'] -JPEGLIBDIR = ['#tools/darwin/libjpeg.framework/Resources/lib'] +JPEGINCLUDE = ['#dependencies/darwin/libjpeg.framework/Headers'] +JPEGLIBDIR = ['#dependencies/darwin/libjpeg.framework/Resources/lib'] JPEGLIB = ['jpeg'] -XERCESINCLUDE = ['#tools/darwin/Xerces-C.framework/Headers'] -XERCESLIBDIR = ['#tools/darwin/Xerces-C.framework/Resources/lib'] +XERCESINCLUDE = ['#dependencies/darwin/Xerces-C.framework/Headers'] +XERCESLIBDIR = ['#dependencies/darwin/Xerces-C.framework/Resources/lib'] XERCESLIB = ['xerces-c'] -GLINCLUDE = ['#tools/darwin/GLEW.framework/Headers'] -GLLIBDIR = ['#tools/darwin/GLEW.framework/Resources/libs'] +GLINCLUDE = ['#dependencies/darwin/GLEW.framework/Headers'] +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'] -COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] +BOOSTLIBDIR = ['dependencies/darwin/libboost.framework/Resources/lib'] +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'] diff --git a/config/config-icl11-win32.py b/config/config-icl11-win32.py new file mode 100644 index 00000000..371e5af1 --- /dev/null +++ b/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' diff --git a/config/config-icl11-win64.py b/config/config-icl11-win64.py index 7b3bf15c..0a011b36 100644 --- a/config/config-icl11-win64.py +++ b/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'] -BOOSTLIB = ['boost_system-iw-mt-1_44', 'boost_filesystem-iw-mt-1_44'] -COLLADAINCLUDE = ['#tools/windows/include/colladadom', '#tools/windows/include/colladadom/1.4'] +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 = ['#tools/windows/lib64', '#tools/windows/lib64/vc90'] +BASELIBDIR = ['#dependencies/windows/lib64', '#dependencies/windows/lib64/vc90'] SHLIBPREFIX = 'lib' SHLIBSUFFIX = '.dll' PROGSUFFIX = '.exe' diff --git a/config/config-msvc2008-win32.py b/config/config-msvc2008-win32.py index 9f7c642c..c746da49 100644 --- a/config/config-msvc2008-win32.py +++ b/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' diff --git a/config/config-msvc2008-win64.py b/config/config-msvc2008-win64.py index ab724282..bd0885ea 100644 --- a/config/config-msvc2008-win64.py +++ b/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' diff --git a/config/config-msvc2010-win32.py b/config/config-msvc2010-win32.py index 927aef5f..14098c1d 100644 --- a/config/config-msvc2010-win32.py +++ b/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' diff --git a/config/config-msvc2010-win64.py b/config/config-msvc2010-win64.py index cb4ee46e..d735ed69 100644 --- a/config/config-msvc2010-win64.py +++ b/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' diff --git a/tools/blender/mitsuba/__init__.py b/data/blender/mitsuba/__init__.py similarity index 100% rename from tools/blender/mitsuba/__init__.py rename to data/blender/mitsuba/__init__.py diff --git a/tools/blender/mitsuba/core/__init__.py b/data/blender/mitsuba/core/__init__.py similarity index 100% rename from tools/blender/mitsuba/core/__init__.py rename to data/blender/mitsuba/core/__init__.py diff --git a/tools/blender/mitsuba/export/__init__.py b/data/blender/mitsuba/export/__init__.py similarity index 100% rename from tools/blender/mitsuba/export/__init__.py rename to data/blender/mitsuba/export/__init__.py diff --git a/tools/blender/mitsuba/export/adjustments.py b/data/blender/mitsuba/export/adjustments.py similarity index 100% rename from tools/blender/mitsuba/export/adjustments.py rename to data/blender/mitsuba/export/adjustments.py diff --git a/tools/blender/mitsuba/export/film.py b/data/blender/mitsuba/export/film.py similarity index 100% rename from tools/blender/mitsuba/export/film.py rename to data/blender/mitsuba/export/film.py diff --git a/tools/blender/mitsuba/matpreview/envmap.exr b/data/blender/mitsuba/matpreview/envmap.exr similarity index 100% rename from tools/blender/mitsuba/matpreview/envmap.exr rename to data/blender/mitsuba/matpreview/envmap.exr diff --git a/tools/blender/mitsuba/matpreview/matpreview.serialized b/data/blender/mitsuba/matpreview/matpreview.serialized similarity index 100% rename from tools/blender/mitsuba/matpreview/matpreview.serialized rename to data/blender/mitsuba/matpreview/matpreview.serialized diff --git a/tools/blender/mitsuba/matpreview/matpreview.xml b/data/blender/mitsuba/matpreview/matpreview.xml similarity index 100% rename from tools/blender/mitsuba/matpreview/matpreview.xml rename to data/blender/mitsuba/matpreview/matpreview.xml diff --git a/tools/blender/mitsuba/operators/__init__.py b/data/blender/mitsuba/operators/__init__.py similarity index 100% rename from tools/blender/mitsuba/operators/__init__.py rename to data/blender/mitsuba/operators/__init__.py diff --git a/tools/blender/mitsuba/outputs/__init__.py b/data/blender/mitsuba/outputs/__init__.py similarity index 100% rename from tools/blender/mitsuba/outputs/__init__.py rename to data/blender/mitsuba/outputs/__init__.py diff --git a/tools/blender/mitsuba/properties/__init__.py b/data/blender/mitsuba/properties/__init__.py similarity index 100% rename from tools/blender/mitsuba/properties/__init__.py rename to data/blender/mitsuba/properties/__init__.py diff --git a/tools/blender/mitsuba/properties/engine.py b/data/blender/mitsuba/properties/engine.py similarity index 100% rename from tools/blender/mitsuba/properties/engine.py rename to data/blender/mitsuba/properties/engine.py diff --git a/tools/blender/mitsuba/properties/integrator.py b/data/blender/mitsuba/properties/integrator.py similarity index 100% rename from tools/blender/mitsuba/properties/integrator.py rename to data/blender/mitsuba/properties/integrator.py diff --git a/tools/blender/mitsuba/properties/lamp.py b/data/blender/mitsuba/properties/lamp.py similarity index 100% rename from tools/blender/mitsuba/properties/lamp.py rename to data/blender/mitsuba/properties/lamp.py diff --git a/tools/blender/mitsuba/properties/material.py b/data/blender/mitsuba/properties/material.py similarity index 100% rename from tools/blender/mitsuba/properties/material.py rename to data/blender/mitsuba/properties/material.py diff --git a/tools/blender/mitsuba/properties/sampler.py b/data/blender/mitsuba/properties/sampler.py similarity index 100% rename from tools/blender/mitsuba/properties/sampler.py rename to data/blender/mitsuba/properties/sampler.py diff --git a/tools/blender/mitsuba/properties/texture.py b/data/blender/mitsuba/properties/texture.py similarity index 100% rename from tools/blender/mitsuba/properties/texture.py rename to data/blender/mitsuba/properties/texture.py diff --git a/tools/blender/mitsuba/readme.txt b/data/blender/mitsuba/readme.txt similarity index 100% rename from tools/blender/mitsuba/readme.txt rename to data/blender/mitsuba/readme.txt diff --git a/tools/blender/mitsuba/render.py b/data/blender/mitsuba/render.py similarity index 100% rename from tools/blender/mitsuba/render.py rename to data/blender/mitsuba/render.py diff --git a/tools/blender/mitsuba/ui/__init__.py b/data/blender/mitsuba/ui/__init__.py similarity index 100% rename from tools/blender/mitsuba/ui/__init__.py rename to data/blender/mitsuba/ui/__init__.py diff --git a/tools/blender/mitsuba/ui/lamps.py b/data/blender/mitsuba/ui/lamps.py similarity index 100% rename from tools/blender/mitsuba/ui/lamps.py rename to data/blender/mitsuba/ui/lamps.py diff --git a/tools/blender/mitsuba/ui/materials/__init__.py b/data/blender/mitsuba/ui/materials/__init__.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/__init__.py rename to data/blender/mitsuba/ui/materials/__init__.py diff --git a/tools/blender/mitsuba/ui/materials/composite.py b/data/blender/mitsuba/ui/materials/composite.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/composite.py rename to data/blender/mitsuba/ui/materials/composite.py diff --git a/tools/blender/mitsuba/ui/materials/dielectric.py b/data/blender/mitsuba/ui/materials/dielectric.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/dielectric.py rename to data/blender/mitsuba/ui/materials/dielectric.py diff --git a/tools/blender/mitsuba/ui/materials/difftrans.py b/data/blender/mitsuba/ui/materials/difftrans.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/difftrans.py rename to data/blender/mitsuba/ui/materials/difftrans.py diff --git a/tools/blender/mitsuba/ui/materials/emission.py b/data/blender/mitsuba/ui/materials/emission.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/emission.py rename to data/blender/mitsuba/ui/materials/emission.py diff --git a/tools/blender/mitsuba/ui/materials/lambertian.py b/data/blender/mitsuba/ui/materials/lambertian.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/lambertian.py rename to data/blender/mitsuba/ui/materials/lambertian.py diff --git a/tools/blender/mitsuba/ui/materials/main.py b/data/blender/mitsuba/ui/materials/main.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/main.py rename to data/blender/mitsuba/ui/materials/main.py diff --git a/tools/blender/mitsuba/ui/materials/microfacet.py b/data/blender/mitsuba/ui/materials/microfacet.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/microfacet.py rename to data/blender/mitsuba/ui/materials/microfacet.py diff --git a/tools/blender/mitsuba/ui/materials/mirror.py b/data/blender/mitsuba/ui/materials/mirror.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/mirror.py rename to data/blender/mitsuba/ui/materials/mirror.py diff --git a/tools/blender/mitsuba/ui/materials/phong.py b/data/blender/mitsuba/ui/materials/phong.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/phong.py rename to data/blender/mitsuba/ui/materials/phong.py diff --git a/tools/blender/mitsuba/ui/materials/roughglass.py b/data/blender/mitsuba/ui/materials/roughglass.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/roughglass.py rename to data/blender/mitsuba/ui/materials/roughglass.py diff --git a/tools/blender/mitsuba/ui/materials/roughmetal.py b/data/blender/mitsuba/ui/materials/roughmetal.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/roughmetal.py rename to data/blender/mitsuba/ui/materials/roughmetal.py diff --git a/tools/blender/mitsuba/ui/materials/ward.py b/data/blender/mitsuba/ui/materials/ward.py similarity index 100% rename from tools/blender/mitsuba/ui/materials/ward.py rename to data/blender/mitsuba/ui/materials/ward.py diff --git a/tools/blender/mitsuba/ui/render_panels.py b/data/blender/mitsuba/ui/render_panels.py similarity index 100% rename from tools/blender/mitsuba/ui/render_panels.py rename to data/blender/mitsuba/ui/render_panels.py diff --git a/tools/blender/mitsuba/ui/textures/__init__.py b/data/blender/mitsuba/ui/textures/__init__.py similarity index 100% rename from tools/blender/mitsuba/ui/textures/__init__.py rename to data/blender/mitsuba/ui/textures/__init__.py diff --git a/tools/blender/mitsuba/ui/textures/checkerboard.py b/data/blender/mitsuba/ui/textures/checkerboard.py similarity index 100% rename from tools/blender/mitsuba/ui/textures/checkerboard.py rename to data/blender/mitsuba/ui/textures/checkerboard.py diff --git a/tools/blender/mitsuba/ui/textures/gridtexture.py b/data/blender/mitsuba/ui/textures/gridtexture.py similarity index 100% rename from tools/blender/mitsuba/ui/textures/gridtexture.py rename to data/blender/mitsuba/ui/textures/gridtexture.py diff --git a/tools/blender/mitsuba/ui/textures/ldrtexture.py b/data/blender/mitsuba/ui/textures/ldrtexture.py similarity index 100% rename from tools/blender/mitsuba/ui/textures/ldrtexture.py rename to data/blender/mitsuba/ui/textures/ldrtexture.py diff --git a/tools/blender/mitsuba/ui/textures/main.py b/data/blender/mitsuba/ui/textures/main.py similarity index 100% rename from tools/blender/mitsuba/ui/textures/main.py rename to data/blender/mitsuba/ui/textures/main.py diff --git a/tools/blender/mitsuba/ui/textures/mapping.py b/data/blender/mitsuba/ui/textures/mapping.py similarity index 100% rename from tools/blender/mitsuba/ui/textures/mapping.py rename to data/blender/mitsuba/ui/textures/mapping.py diff --git a/tools/darwin/Info.plist b/data/darwin/Info.plist similarity index 100% rename from tools/darwin/Info.plist rename to data/darwin/Info.plist diff --git a/tools/darwin/Mitsuba.dmgCanvas/Disk Image b/data/darwin/Mitsuba.dmgCanvas/Disk Image similarity index 100% rename from tools/darwin/Mitsuba.dmgCanvas/Disk Image rename to data/darwin/Mitsuba.dmgCanvas/Disk Image diff --git a/tools/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg b/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg similarity index 100% rename from tools/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg rename to data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg diff --git a/tools/darwin/PkgInfo b/data/darwin/PkgInfo similarity index 100% rename from tools/darwin/PkgInfo rename to data/darwin/PkgInfo diff --git a/tools/darwin/PreviewSettings.nib/designable.nib b/data/darwin/PreviewSettings.nib/designable.nib similarity index 100% rename from tools/darwin/PreviewSettings.nib/designable.nib rename to data/darwin/PreviewSettings.nib/designable.nib diff --git a/tools/darwin/PreviewSettings.nib/keyedobjects.nib b/data/darwin/PreviewSettings.nib/keyedobjects.nib similarity index 100% rename from tools/darwin/PreviewSettings.nib/keyedobjects.nib rename to data/darwin/PreviewSettings.nib/keyedobjects.nib diff --git a/tools/darwin/Resources/mitsuba.icns b/data/darwin/Resources/mitsuba.icns similarity index 100% rename from tools/darwin/Resources/mitsuba.icns rename to data/darwin/Resources/mitsuba.icns diff --git a/tools/darwin/build-dmg.sh b/data/darwin/build-dmg.sh similarity index 100% rename from tools/darwin/build-dmg.sh rename to data/darwin/build-dmg.sh diff --git a/tools/darwin/qt.conf b/data/darwin/qt.conf similarity index 100% rename from tools/darwin/qt.conf rename to data/darwin/qt.conf diff --git a/tools/linux/build-sourcedist.sh b/data/linux/build-sourcedist.sh similarity index 100% rename from tools/linux/build-sourcedist.sh rename to data/linux/build-sourcedist.sh diff --git a/tools/linux/debian/changelog b/data/linux/debian/changelog similarity index 100% rename from tools/linux/debian/changelog rename to data/linux/debian/changelog diff --git a/tools/linux/debian/compat b/data/linux/debian/compat similarity index 100% rename from tools/linux/debian/compat rename to data/linux/debian/compat diff --git a/tools/linux/debian/control b/data/linux/debian/control similarity index 100% rename from tools/linux/debian/control rename to data/linux/debian/control diff --git a/tools/linux/debian/copyright b/data/linux/debian/copyright similarity index 100% rename from tools/linux/debian/copyright rename to data/linux/debian/copyright diff --git a/tools/linux/debian/mitsuba-dev.install b/data/linux/debian/mitsuba-dev.install similarity index 100% rename from tools/linux/debian/mitsuba-dev.install rename to data/linux/debian/mitsuba-dev.install diff --git a/tools/linux/debian/mitsuba.install b/data/linux/debian/mitsuba.install similarity index 100% rename from tools/linux/debian/mitsuba.install rename to data/linux/debian/mitsuba.install diff --git a/tools/linux/debian/rules b/data/linux/debian/rules similarity index 100% rename from tools/linux/debian/rules rename to data/linux/debian/rules diff --git a/tools/linux/fontgen/Makefile b/data/linux/fontgen/Makefile similarity index 100% rename from tools/linux/fontgen/Makefile rename to data/linux/fontgen/Makefile diff --git a/tools/linux/fontgen/Vera.ttf b/data/linux/fontgen/Vera.ttf similarity index 100% rename from tools/linux/fontgen/Vera.ttf rename to data/linux/fontgen/Vera.ttf diff --git a/tools/linux/fontgen/VeraMono.ttf b/data/linux/fontgen/VeraMono.ttf similarity index 100% rename from tools/linux/fontgen/VeraMono.ttf rename to data/linux/fontgen/VeraMono.ttf diff --git a/tools/linux/fontgen/bin2c.c b/data/linux/fontgen/bin2c.c similarity index 100% rename from tools/linux/fontgen/bin2c.c rename to data/linux/fontgen/bin2c.c diff --git a/tools/linux/fontgen/fontgen.cpp b/data/linux/fontgen/fontgen.cpp similarity index 100% rename from tools/linux/fontgen/fontgen.cpp rename to data/linux/fontgen/fontgen.cpp diff --git a/tools/linux/fontgen/gen.sh b/data/linux/fontgen/gen.sh similarity index 100% rename from tools/linux/fontgen/gen.sh rename to data/linux/fontgen/gen.sh diff --git a/tools/linux/mitsuba.desktop b/data/linux/mitsuba.desktop similarity index 100% rename from tools/linux/mitsuba.desktop rename to data/linux/mitsuba.desktop diff --git a/tools/linux/nvidia.supp b/data/linux/nvidia.supp similarity index 100% rename from tools/linux/nvidia.supp rename to data/linux/nvidia.supp diff --git a/tools/plugin-starter-kit/README b/data/plugin-starter-kit/README similarity index 100% rename from tools/plugin-starter-kit/README rename to data/plugin-starter-kit/README diff --git a/tools/plugin-starter-kit/SConstruct b/data/plugin-starter-kit/SConstruct similarity index 100% rename from tools/plugin-starter-kit/SConstruct rename to data/plugin-starter-kit/SConstruct diff --git a/tools/plugin-starter-kit/myutil.cpp b/data/plugin-starter-kit/myutil.cpp similarity index 100% rename from tools/plugin-starter-kit/myutil.cpp rename to data/plugin-starter-kit/myutil.cpp diff --git a/tools/qt4.py b/data/qt4.py similarity index 100% rename from tools/qt4.py rename to data/qt4.py diff --git a/tools/tests/bunny.ply b/data/tests/bunny.ply similarity index 100% rename from tools/tests/bunny.ply rename to data/tests/bunny.ply diff --git a/tools/windows/build-dist.bat b/data/windows/build-dist.bat similarity index 100% rename from tools/windows/build-dist.bat rename to data/windows/build-dist.bat diff --git a/tools/windows/mitsuba.ico b/data/windows/mitsuba.ico similarity index 100% rename from tools/windows/mitsuba.ico rename to data/windows/mitsuba.ico diff --git a/tools/windows/mitsuba_res.rc b/data/windows/mitsuba_res.rc similarity index 100% rename from tools/windows/mitsuba_res.rc rename to data/windows/mitsuba_res.rc