SCons updates

* libraries are now generated in [BUILD_DIR]/lib
* passed the user_options to all libraries now.
  This means I could remove a couple of Export/Import lines.
* Changed the order in source/blender/src/SConscript and
  source/gameengine/SConscript.
  All libraries are now sorted alphabetically. This has no impact on the build
  process.

42 files changed, 113 insertions, 79 deletions

diff --git a/source/SConscript b/source/SConscript
index 188c7c30051..e0005569caf 100644
--- a/source/SConscript
+++ b/source/SConscript
@@ -1,6 +1,6 @@
-Import ('use_gameengine')
+Import ('user_options_dict')
 
 SConscript(['blender/SConscript',
             'kernel/SConscript'])
-if use_gameengine == 'true':
+if user_options_dict['BUILD_GAMEENGINE'] == 1:
     SConscript (['gameengine/SConscript'])
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 3b01792081d..0efdb463ba9 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -1,29 +1,28 @@
-Import ('use_quicktime')
-Import ('use_international')
+Import ('user_options_dict')
 
-SConscript(['blenloader/SConscript',
+SConscript(['avi/SConscript',
+            'blenkernel/SConscript',
+            'blenlib/SConscript',
+            'blenloader/SConscript',
+            'blenpluginapi/SConscript',
             'deflate/SConscript',
-            'inflate/SConscript',
-            'writestreamglue/SConscript',
-            'readstreamglue/SConscript',
-            'writeblenfile/SConscript',
-            'readblenfile/SConscript',
-            'avi/SConscript',
             'imbuf/SConscript',
             'img/SConscript',
-            'render/SConscript',
-            'radiosity/SConscript',
-            'blenlib/SConscript',
-            'blenkernel/SConscript',
-            'blenpluginapi/SConscript',
-            'python/SConscript',
+            'inflate/SConscript',
             'makesdna/SConscript',
-            'src/SConscript',
+            'python/SConscript',
+            'radiosity/SConscript',
+            'readblenfile/SConscript',
+            'readstreamglue/SConscript',
+            'render/SConscript',
             'renderconverter/SConscript',
+            'src/SConscript',
+            'writeblenfile/SConscript',
+            'writestreamglue/SConscript',
             'yafray/SConscript'])
 
-if use_international == 'true':
+if user_options_dict['USE_INTERNATIONAL'] == 1:
     SConscript (['ftfont/SConscript'])
 
-if use_quicktime == 'true':
+if user_options_dict['USE_QUICKTIME'] == 1:
     SConscript (['quicktime/SConscript'])
diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript
index e312c65ff84..8548178606c 100644
--- a/source/blender/avi/SConscript
+++ b/source/blender/avi/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 avi_env.Append (CCFLAGS = cflags)
 avi_env.Append (CXXFLAGS = cxxflags)
 avi_env.Append (CPPDEFINES = defines)
@@ -21,4 +22,4 @@ avi_env.Append (CPPPATH = ['.',
                            '#/intern/guardedalloc'])
 
 avi_env.Append (CPPPATH=extra_includes)
-avi_env.Library (target='#/lib/blender_avi', source=source_files)
+avi_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_avi', source=source_files)
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index e82ebebb2f9..7f151f68e26 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -4,6 +4,7 @@ blenkernel_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 blenkernel_env.Append (CCFLAGS = cflags)
 blenkernel_env.Append (CXXFLAGS = cxxflags)
 blenkernel_env.Append (CPPDEFINES = defines)
@@ -57,4 +58,4 @@ blenkernel_env.Append (CPPPATH = ['.',
                                   '#/intern/iksolver/extern',
                                   '../blenloader'])
 
-blenkernel_env.Library (target='#/lib/blender_blenkernel', source=source_files)
+blenkernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenkernel', source=source_files)
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 956e766edf9..d3172a3515f 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 blenlib_env.Append (CCFLAGS = cflags)
 blenlib_env.Append (CXXFLAGS = cxxflags)
 blenlib_env.Append (CPPDEFINES = defines)
@@ -38,4 +39,4 @@ blenlib_env.Append (CPPPATH = ['.',
                                '../include'])
 
 blenlib_env.Append (CPPPATH = extra_includes)
-blenlib_env.Library (target='#/lib/blender_blenlib', source=source_files)
+blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files)
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index 2a11d60bf44..fdaa06afa62 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -4,6 +4,7 @@ blenloader_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 blenloader_env.Append (CCFLAGS = cflags)
 blenloader_env.Append (CXXFLAGS = cxxflags)
 blenloader_env.Append (CPPDEFINES = defines)
@@ -26,4 +27,4 @@ blenloader_env.Append (CPPPATH = ['.',
                                   '../writestreamglue',
                                   '../readstreamglue'])
 
-blenloader_env.Library (target='#/lib/blender_blenloader', source=source_files)
+blenloader_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenloader', source=source_files)
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
index 33800197f6d..91854db6816 100644
--- a/source/blender/blenpluginapi/SConscript
+++ b/source/blender/blenpluginapi/SConscript
@@ -4,6 +4,7 @@ blenplugin_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 blenplugin_env.Append (CCFLAGS = cflags)
 blenplugin_env.Append (CXXFLAGS = cxxflags)
 blenplugin_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ blenplugin_env.Append (CPPPATH = ['.',
                                   '../imbuf',
                                   '../makesdna'])
 
-blenplugin_env.Library (target='#/lib/blender_blenpluginapi', source=source_files)
+blenplugin_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenpluginapi', source=source_files)
diff --git a/source/blender/deflate/SConscript b/source/blender/deflate/SConscript
index d20f7db7fd6..190e4ed416b 100644
--- a/source/blender/deflate/SConscript
+++ b/source/blender/deflate/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 deflate_env.Append (CCFLAGS = cflags)
 deflate_env.Append (CXXFLAGS = cxxflags)
 deflate_env.Append (CPPDEFINES = defines)
@@ -18,4 +19,4 @@ deflate_env.Append (CPPPATH = ['.',
                                '../inflate'])
 
 deflate_env.Append (CPPPATH=extra_includes)
-deflate_env.Library (target='#/lib/blender_deflate', source=source_files)
+deflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_deflate', source=source_files)
diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript
index d75b2abfc37..f44b765ec76 100644
--- a/source/blender/ftfont/SConscript
+++ b/source/blender/ftfont/SConscript
@@ -3,6 +3,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('extra_includes')
 Import ('defines')
+Import ('user_options_dict')
 
 source_files = ['intern/FTF_Api.cpp',
                 'intern/FTF_TTFont.cpp']
@@ -18,4 +19,4 @@ ftf_env.Append(CPPPATH = include_paths)
 ftf_env.Append(CCFLAGS = cflags)
 ftf_env.Append(CXXFLAGS = cxxflags)
 ftf_env.Append(CPPDEFINES = defines)
-ftf_env.Library (target='#/lib/blender_FTF', source=source_files)
+ftf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_FTF', source=source_files)
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 52a1795d666..d67b80c5b8a 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 imbuf_env.Append (CCFLAGS = cflags)
 imbuf_env.Append (CXXFLAGS = cxxflags)
 imbuf_env.Append (CPPDEFINES = defines)
@@ -46,4 +47,4 @@ imbuf_env.Append (CPPPATH = ['.',
                              '../blenkernel'])
 
 imbuf_env.Append (CPPPATH = extra_includes)
-imbuf_env.Library (target='#/lib/blender_imbuf', source=source_files)
+imbuf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_imbuf', source=source_files)
diff --git a/source/blender/img/SConscript b/source/blender/img/SConscript
index 8766eb76ba2..99f8d84e97c 100644
--- a/source/blender/img/SConscript
+++ b/source/blender/img/SConscript
@@ -4,6 +4,7 @@ img_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 img_env.Append (CCFLAGS = cflags)
 img_env.Append (CXXFLAGS = cxxflags)
 img_env.Append (CPPDEFINES = defines)
@@ -16,4 +17,4 @@ source_files = ['intern/IMG_Api.cpp',
                 'intern/IMG_PixmapRGBA32.cpp',
                 'intern/IMG_Rect.cpp']
 
-img_env.Library (target='#/lib/blender_img', source=source_files)
+img_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_img', source=source_files)
diff --git a/source/blender/inflate/SConscript b/source/blender/inflate/SConscript
index 4ffb3b48ebc..65bb8586799 100644
--- a/source/blender/inflate/SConscript
+++ b/source/blender/inflate/SConscript
@@ -6,6 +6,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 inflate_env.Append (CCFLAGS = cflags)
 inflate_env.Append (CXXFLAGS = cxxflags)
 inflate_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ inflate_env.Append (CPPPATH = ['.',
                                '../readstreamglue'])
 
 inflate_env.Append (CPPPATH = extra_includes)
-inflate_env.Library (target='#/lib/blender_inflate', source=source_files)
+inflate_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_inflate', source=source_files)
diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript
index 8a496e383da..a73336c1aed 100644
--- a/source/blender/makesdna/SConscript
+++ b/source/blender/makesdna/SConscript
@@ -4,6 +4,7 @@ makesdna_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 makesdna_env.Append (CCFLAGS = cflags)
 makesdna_env.Append (CXXFLAGS = cxxflags)
 makesdna_env.Append (CPPDEFINES = defines)
@@ -15,4 +16,4 @@ objs.append (o)
 
 makesdna_env.Append (CPPPATH = ['#/intern/guardedalloc'])
 
-makesdna_env.Library (target='#/lib/blender_makesdna', source=objs)
+makesdna_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_makesdna', source=objs)
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index f636b228a63..5924dcb7eb3 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -6,7 +6,7 @@ Import ('defines')
 Import ('platform_libs')
 Import ('platform_libpath')
 Import ('platform_linkflags')
-Import ('root_build_dir')
+Import ('user_options_dict')
 
 if sys.platform=='win32':
     platform_linkflags = ['/SUBSYSTEM:CONSOLE',
@@ -33,14 +33,14 @@ makesdna_tool.Append (CCFLAGS = cflags)
 makesdna_tool.Append (CXXFLAGS = cxxflags)
 makesdna_tool.Append (CPPDEFINES = defines)
 makesdna_tool.Append (LINKFLAGS = platform_linkflags)
-makesdna_tool.Append (LIBPATH = '#/lib')
+makesdna_tool.Append (LIBPATH = '#'+user_options_dict['BUILD_DIR']+'/lib')
 makesdna_tool.Append (LIBS = 'blender_guardedalloc')
-makesdna_tool.Program (target = '#'+root_build_dir+'makesdna', source = source_files)
+makesdna_tool.Program (target = '#'+user_options_dict['BUILD_DIR']+'makesdna', source = source_files)
 
 dna = Environment ()
 dna_dict = dna.Dictionary()
-makesdna_name = root_build_dir+'makesdna' + dna_dict['PROGSUFFIX']
+makesdna_name = user_options_dict['BUILD_DIR']+'makesdna' + dna_dict['PROGSUFFIX']
 dna.Depends ('dna.c', '#'+makesdna_name)
-dna.Command ('dna.c', '', root_build_dir+"makesdna $TARGET")
+dna.Command ('dna.c', '', user_options_dict['BUILD_DIR']+"makesdna $TARGET")
 obj = 'intern/dna.c'
 Return ('obj')
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 02a9444b128..66b359bc61e 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -6,6 +6,7 @@ Import ('cxxflags')
 Import ('defines')
 Import ('python_include')
 Import ('extra_includes')
+Import ('user_options_dict')
 python_env.Append (CCFLAGS = cflags)
 python_env.Append (CXXFLAGS = cxxflags)
 python_env.Append (CPPDEFINES = defines)
@@ -60,4 +61,4 @@ python_env.Append (CPPPATH = ['api2_2x',
                               python_include])
 
 python_env.Append (CPPPATH = extra_includes)
-python_env.Library (target='#/lib/blender_python', source=source_files)
+python_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_python', source=source_files)
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript
index bcc1792d586..07c22398fef 100644
--- a/source/blender/quicktime/SConscript
+++ b/source/blender/quicktime/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('extra_includes')
 Import ('defines')
+Import ('user_options_dict')
 quicktime_env.Append (CCFLAGS = cflags)
 quicktime_env.Append (CXXFLAGS = cxxflags)
 quicktime_env.Append (CPPPATH = extra_includes)
@@ -24,4 +25,4 @@ quicktime_env.Append (CPPPATH = ['.',
                                  '../readstreamglue',
                                  '../render/extern/include'])
 
-quicktime_env.Library (target='#/lib/blender_quicktime', source=source_files)
+quicktime_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_quicktime', source=source_files)
diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript
index e88e896f095..512d7dad0a4 100644
--- a/source/blender/radiosity/SConscript
+++ b/source/blender/radiosity/SConscript
@@ -4,6 +4,7 @@ rad_env = Environment ()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 rad_env.Append (CCFLAGS = cflags)
 rad_env.Append (CXXFLAGS = cxxflags)
 rad_env.Append (CPPDEFINES = defines)
@@ -24,4 +25,4 @@ rad_env.Append (CPPPATH = ['extern/include',
                            '#/intern/guardedalloc',
                            '../render/extern/include'])
 
-rad_env.Library (target='#/lib/blender_radiosity', source=source_files)
+rad_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_radiosity', source=source_files)
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
index 4ba91d55c9a..4452b21f718 100644
--- a/source/blender/readblenfile/SConscript
+++ b/source/blender/readblenfile/SConscript
@@ -4,6 +4,7 @@ readblenfile_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 readblenfile_env.Append (CCFLAGS = cflags)
 readblenfile_env.Append (CXXFLAGS = cxxflags)
 readblenfile_env.Append (CPPDEFINES = defines)
@@ -16,4 +17,4 @@ readblenfile_env.Append (CPPPATH = ['.',
                                     '../blenkernel',
                                     '../../kernel/gen_messaging'])
 
-readblenfile_env.Library (target='#/lib/blender_readblenfile', source=source_files)
+readblenfile_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_readblenfile', source=source_files)
diff --git a/source/blender/readstreamglue/SConscript b/source/blender/readstreamglue/SConscript
index d1dc3084db6..3c96bcca9b0 100644
--- a/source/blender/readstreamglue/SConscript
+++ b/source/blender/readstreamglue/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 readstrgl_env.Append (CCFLAGS = cflags)
 readstrgl_env.Append (CXXFLAGS = cxxflags)
 readstrgl_env.Append (CPPDEFINES = defines)
@@ -18,4 +19,4 @@ readstrgl_env.Append (CPPPATH = ['.',
                                  '../inflate'])
 
 readstrgl_env.Append (CPPPATH = extra_includes)
-readstrgl_env.Library (target='#/lib/blender_readstreamglue', source=source_files)
+readstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_readstreamglue', source=source_files)
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index 311f90d27d6..ea9d30a7003 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -4,6 +4,7 @@ render_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 render_env.Append (CCFLAGS = cflags)
 render_env.Append (CXXFLAGS = cxxflags)
 render_env.Append (CPPDEFINES = defines)
@@ -43,4 +44,4 @@ render_env.Append (CPPPATH = ['intern/include',
                               '../../kernel/gen_messaging',
                               '../yafray'])
 
-render_env.Library (target='#/lib/blender_render', source=source_files)
+render_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_render', source=source_files)
diff --git a/source/blender/renderconverter/SConscript b/source/blender/renderconverter/SConscript
index b3f49dd9451..1cd12c181f9 100644
--- a/source/blender/renderconverter/SConscript
+++ b/source/blender/renderconverter/SConscript
@@ -4,6 +4,7 @@ renderconv_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 renderconv_env.Append (CCFLAGS = cflags)
 renderconv_env.Append (CXXFLAGS = cxxflags)
 renderconv_env.Append (CPPDEFINES = defines)
@@ -19,4 +20,4 @@ renderconv_env.Append (CPPPATH = ['.',
                                   '../render/extern/include',
                                   '../python'])
 
-renderconv_env.Library (target='#/lib/blender_renderconverter', source=source_files)
+renderconv_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_renderconverter', source=source_files)
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 8b84934271f..c718ad1c90f 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -8,7 +8,7 @@ Import ('python_include')
 Import ('sdl_cflags')
 Import ('sdl_include')
 Import ('extra_includes')
-Import ('use_international')
+Import ('user_options_dict')
 src_env.Append (CCFLAGS = cflags)
 src_env.Append (CCFLAGS = sdl_cflags)
 src_env.Append (CXXFLAGS = cxxflags)
@@ -140,9 +140,9 @@ src_env.Append (CPPPATH = ['#/intern/guardedalloc',
                            python_include,
                            sdl_include])
 
-if use_international=='true':
+if user_options_dict['USE_INTERNATIONAL'] == 1:
     src_env.Append (CPPPATH=['../ftfont'])
 
 src_env.Append (CPPPATH=extra_includes)
 
-src_env.Library (target='#/lib/blender_blendersrc', source=source_files)
+src_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blendersrc', source=source_files)
diff --git a/source/blender/writeblenfile/SConscript b/source/blender/writeblenfile/SConscript
index c669b495cfc..48a1cba4949 100644
--- a/source/blender/writeblenfile/SConscript
+++ b/source/blender/writeblenfile/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 wrblenfile_env.Append (CCFLAGS = cflags)
 wrblenfile_env.Append (CXXFLAGS = cxxflags)
 wrblenfile_env.Append (CPPDEFINES = defines)
@@ -19,4 +20,4 @@ wrblenfile_env.Append (CPPPATH = ['.',
                                   '../readblenfile'])
 
 wrblenfile_env.Append (CPPPATH = extra_includes)
-wrblenfile_env.Library (target='#/lib/blender_writeblenfile', source=source_files)
+wrblenfile_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writeblenfile', source=source_files)
diff --git a/source/blender/writestreamglue/SConscript b/source/blender/writestreamglue/SConscript
index 455f53b3306..aa2d4d10e2e 100644
--- a/source/blender/writestreamglue/SConscript
+++ b/source/blender/writestreamglue/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('extra_includes')
+Import ('user_options_dict')
 wrstrgl_env.Append (CCFLAGS = cflags)
 wrstrgl_env.Append (CXXFLAGS = cxxflags)
 wrstrgl_env.Append (CPPDEFINES = defines)
@@ -21,4 +22,4 @@ wrstrgl_env.Append (CPPPATH = ['.',
                                '../../kernel/gen_messaging'])
 
 wrstrgl_env.Append (CPPPATH = extra_includes)
-wrstrgl_env.Library (target='#/lib/blender_writestreamglue', source=source_files)
+wrstrgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_writestreamglue', source=source_files)
diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript
index aa721ecb004..88cc6ff44bc 100644
--- a/source/blender/yafray/SConscript
+++ b/source/blender/yafray/SConscript
@@ -4,6 +4,7 @@ yafray_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 yafray_env.Append (CCFLAGS = cflags)
 yafray_env.Append (CXXFLAGS = cxxflags)
 yafray_env.Append (CPPDEFINES = defines)
@@ -19,4 +20,4 @@ yafray_env.Append (CPPPATH = ['#/intern/guardedalloc',
                               '../imbuf',
                               '../render/extern/include'])
 
-yafray_env.Library (target='#/lib/blender_yafray', source=source_files)
+yafray_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_yafray', source=source_files)
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 2116f9fec3b..0e39cf02107 100755
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -5,6 +5,8 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('python_include')
+Import ('solid_include')
+Import ('user_options_dict')
 kx_blenderhook_env.Append (CCFLAGS = cflags)
 kx_blenderhook_env.Append (CXXFLAGS = cxxflags)
 kx_blenderhook_env.Append (CPPDEFINES = defines)
@@ -46,7 +48,7 @@ kx_blenderhook_env.Append (CPPPATH=['.',
                                     '#intern/SoundSystem',
                                     '#source/blender/misc',
                                     '#source/blender/blenloader',
-                                    '#../lib/windows/solid/include',
+                                    solid_include,
                                     ])
 
-kx_blenderhook_env.Library (target='#/lib/KX_blenderhook', source=source_files)
+kx_blenderhook_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_blenderhook', source=source_files)
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 9567844c8dd..795274ca345 100755
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -6,6 +6,7 @@ Import ('cxxflags')
 Import ('defines')
 Import ('solid_include')
 Import ('python_include')
+Import ('user_options_dict')
 kx_converter_env.Append (CCFLAGS = cflags)
 kx_converter_env.Append (CXXFLAGS = cxxflags)
 kx_converter_env.Append (CPPDEFINES = defines)
@@ -66,4 +67,4 @@ kx_converter_env.Append (CPPPATH = ['.',
                                     solid_include
                                     ])
 
-kx_converter_env.Library (target='#/lib/KX_converter', source=source_files)
+kx_converter_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_converter', source=source_files)
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index c750bcd3e1a..5a5205bd3bc 100755
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('python_include')
+Import ('user_options_dict')
 expressions_env.Append (CCFLAGS = cflags)
 expressions_env.Append (CXXFLAGS = cxxflags)
 expressions_env.Append (CPPDEFINES = defines)
@@ -34,4 +35,4 @@ expressions_env.Append (CPPPATH = ['.',
                                    '#intern/string',
                                    python_include])
 
-expressions_env.Library (target='#/lib/blender_expressions', source=source_files)
+expressions_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_expressions', source=source_files)
diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index c61b708ec43..33de774b314 100755
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('python_include')
+Import ('user_options_dict')
 sca_gamelogic_env.Append (CCFLAGS = cflags)
 sca_gamelogic_env.Append (CXXFLAGS = cxxflags)
 sca_gamelogic_env.Append (CPPDEFINES = defines)
@@ -45,4 +46,4 @@ sca_gamelogic_env.Append (CPPPATH=['.',
                                    python_include,
                                   ])
 
-sca_gamelogic_env.Library (target='#/lib/SCA_GameLogic', source=source_files)
+sca_gamelogic_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SCA_GameLogic', source=source_files)
diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript
index 61e31bb0f66..43dc4998c36 100755
--- a/source/gameengine/Ketsji/KXNetwork/SConscript
+++ b/source/gameengine/Ketsji/KXNetwork/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('python_include')
+Import ('user_options_dict')
 kx_network_env.Append (CCFLAGS = cflags)
 kx_network_env.Append (CXXFLAGS = cxxflags)
 kx_network_env.Append (CPPDEFINES = defines)
@@ -26,4 +27,4 @@ kx_network_env.Append (CPPPATH = ['.',
                                   '#source/gameengine/Network',
                                  ])
 
-kx_network_env.Library (target='#/lib/KX_network', source=source_files)
+kx_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_network', source=source_files)
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 75eff210137..f035f5f4b9e 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -4,10 +4,9 @@ ketsji_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('use_sumo')
-Import ('use_ode')
 Import ('python_include')
 Import ('solid_include')
+Import ('user_options_dict')
 ketsji_env.Append (CCFLAGS = cflags)
 ketsji_env.Append (CXXFLAGS = cxxflags)
 ketsji_env.Append (CPPDEFINES = defines)
@@ -62,11 +61,11 @@ source_files = ['KX_WorldIpoController.cpp',
                 'KX_Camera.cpp'
                 ]
 
-if use_sumo == 'true':
+if user_options_dict['USE_PHYSICS'] == 'solid':
     source_files += ['KX_SumoPhysicsController.cpp']
     ketsji_env.Append (CPPPATH = [solid_include])
 
-if use_ode == 'true':
+if user_options_dict['USE_PHYSICS'] == 'ode':
     source_files += ['KX_OdePhysicsController.cpp']
 
 ketsji_env.Append (CPPPATH = ['.',
@@ -108,4 +107,4 @@ ketsji_env.Append (CPPPATH = ['.',
                               python_include
                              ])
 
-ketsji_env.Library (target='#/lib/KX_ketsji', source=source_files)
+ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files)
diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index a6cd3c435fa..65157902f48 100755
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -4,6 +4,7 @@ ng_loopbacknetwork_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ng_loopbacknetwork_env.Append (CCFLAGS = cflags)
 ng_loopbacknetwork_env.Append (CXXFLAGS = cxxflags)
 ng_loopbacknetwork_env.Append (CPPDEFINES = defines)
@@ -16,4 +17,4 @@ ng_loopbacknetwork_env.Append (CPPPATH=['.',
                                         '#source/gameengine/Network',
                                        ])
 
-ng_loopbacknetwork_env.Library (target='#/lib/NG_loopbacknetwork', source=source_files)
+ng_loopbacknetwork_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_loopbacknetwork', source=source_files)
diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index 443803f9ce3..15c42cae371 100755
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -4,6 +4,7 @@ ng_network_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ng_network_env.Append (CCFLAGS = cflags)
 ng_network_env.Append (CXXFLAGS = cxxflags)
 ng_network_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ ng_network_env.Append (CPPPATH=['.',
                                 '#intern/string'
                                ])
 
-ng_network_env.Library (target='#/lib/NG_network', source=source_files)
+ng_network_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/NG_network', source=source_files)
diff --git a/source/gameengine/Physics/BlOde/SConscript b/source/gameengine/Physics/BlOde/SConscript
index 43ddbd31c06..0d5804cf5ac 100755
--- a/source/gameengine/Physics/BlOde/SConscript
+++ b/source/gameengine/Physics/BlOde/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('ode_include')
+Import ('user_options_dict')
 phy_ode_env.Append (CCFLAGS = cflags)
 phy_ode_env.Append (CXXFLAGS = cxxflags)
 phy_ode_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ phy_ode_env.Append (CPPPATH=['.',
                              ode_include
                             ])
 
-phy_ode_env.Library (target='#/lib/PHY_Ode', source=source_files)
+phy_ode_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Ode', source=source_files)
diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript
index 746c16bb9f3..7d634918b38 100755
--- a/source/gameengine/Physics/Dummy/SConscript
+++ b/source/gameengine/Physics/Dummy/SConscript
@@ -4,6 +4,7 @@ phy_dummy_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 phy_dummy_env.Append (CCFLAGS = cflags)
 phy_dummy_env.Append (CXXFLAGS = cxxflags)
 phy_dummy_env.Append (CPPDEFINES = defines)
@@ -14,4 +15,4 @@ phy_dummy_env.Append (CPPPATH = ['.',
                                  '../common'
                                 ])
 
-phy_dummy_env.Library (target='#/lib/PHY_Dummy', source=source_files)
+phy_dummy_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Dummy', source=source_files)
diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript
index a59e66cd850..556b470f60e 100755
--- a/source/gameengine/Physics/Sumo/SConscript
+++ b/source/gameengine/Physics/Sumo/SConscript
@@ -5,6 +5,7 @@ Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
 Import ('solid_include')
+Import ('user_options_dict')
 phy_sumo_env.Append (CCFLAGS = cflags)
 phy_sumo_env.Append (CXXFLAGS = cxxflags)
 phy_sumo_env.Append (CPPDEFINES = defines)
@@ -22,4 +23,4 @@ phy_sumo_env.Append (CPPPATH = ['.',
                                 '#/intern/moto/include'
                                ])
 
-phy_sumo_env.Library (target='#/lib/PHY_Sumo', source=source_files)
+phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files)
diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index 81cc93fa3c1..016f06b39d3 100755
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -4,6 +4,7 @@ phy_physics_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 phy_physics_env.Append (CCFLAGS = cflags)
 phy_physics_env.Append (CXXFLAGS = cxxflags)
 phy_physics_env.Append (CPPDEFINES = defines)
@@ -16,4 +17,4 @@ phy_physics_env.Append (CPPPATH = ['.',
                                    '../Dummy'
                                   ])
 
-phy_physics_env.Library (target='#/lib/PHY_Physics', source=source_files)
+phy_physics_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Physics', source=source_files)
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index d1dd79b55e8..88747440ed7 100755
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -4,6 +4,7 @@ ras_openglrasterizer_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ras_openglrasterizer_env.Append (CCFLAGS = cflags)
 ras_openglrasterizer_env.Append (CXXFLAGS = cxxflags)
 ras_openglrasterizer_env.Append (CPPDEFINES = defines)
@@ -19,4 +20,4 @@ ras_openglrasterizer_env.Append (CPPPATH=['.',
                                           '#source/gameengine/Rasterizer'
                                          ])
 
-ras_openglrasterizer_env.Library (target='#/lib/RAS_OpenGLRasterizer', source=source_files)
+ras_openglrasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_OpenGLRasterizer', source=source_files)
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index 5d8b31d53ec..b27992e6b5c 100755
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -4,6 +4,7 @@ ras_rasterizer_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 ras_rasterizer_env.Append (CCFLAGS = cflags)
 ras_rasterizer_env.Append (CXXFLAGS = cxxflags)
 ras_rasterizer_env.Append (CPPDEFINES = defines)
@@ -24,4 +25,4 @@ ras_rasterizer_env.Append (CPPPATH=['.',
                                     '#intern/moto/include'
                                    ])
 
-ras_rasterizer_env.Library (target='#/lib/RAS_rasterizer', source=source_files)
+ras_rasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_rasterizer', source=source_files)
diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript
index 9ae0df1a8aa..1984c121b00 100644
--- a/source/gameengine/SConscript
+++ b/source/gameengine/SConscript
@@ -1,22 +1,21 @@
-Import ('use_ode')
-Import ('use_sumo')
+Import ('user_options_dict')
 
-SConscript(['Ketsji/SConscript',
-            'Ketsji/KXNetwork/SConscript',
-            'Expressions/SConscript',
-            'BlenderRoutines/SConscript',
+SConscript(['BlenderRoutines/SConscript',
             'Converter/SConscript',
+            'Expressions/SConscript',
+            'GameLogic/SConscript',
+            'Ketsji/SConscript',
+            'Ketsji/KXNetwork/SConscript',
             'Network/SConscript',
             'Network/LoopBackNetwork/SConscript',
-            'GameLogic/SConscript',
             'Physics/common/SConscript',
             'Physics/Dummy/SConscript',
             'Rasterizer/SConscript',
             'Rasterizer/RAS_OpenGLRasterizer/SConscript',
             'SceneGraph/SConscript'])
 
-if use_sumo == 'true':
+if user_options_dict['USE_PHYSICS'] == 'solid':
     SConscript(['Physics/Sumo/SConscript'])
 
-if use_ode == 'true':
+if user_options_dict['USE_PHYSICS'] == 'ode':
     SConscript(['Physics/BlOde/SConscript'])
diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index 6f51bef7989..4e98000a36c 100755
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -4,6 +4,7 @@ sg_scenegraph_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 sg_scenegraph_env.Append (CCFLAGS = cflags)
 sg_scenegraph_env.Append (CXXFLAGS = cxxflags)
 sg_scenegraph_env.Append (CPPDEFINES = defines)
@@ -17,4 +18,4 @@ sg_scenegraph_env.Append (CPPPATH=['.',
                                    '#intern/moto/include'
                                   ])
 
-sg_scenegraph_env.Library (target='#/lib/SG_SceneGraph', source=source_files)
+sg_scenegraph_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SG_SceneGraph', source=source_files)
diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index 0439f7169bc..88e968b66c6 100644
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -4,6 +4,7 @@ kernel_env = Environment ()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 kernel_env.Append (CCFLAGS = cflags)
 kernel_env.Append (CXXFLAGS = cxxflags)
 kernel_env.Append (CPPDEFINES = defines)
@@ -19,4 +20,4 @@ kernel_env.Append (CPPPATH = ['gen_messaging',
                               '#/intern/string',
                               '#/intern/moto/include'])
 
-kernel_env.Library (target='#/lib/blender_kernel', source=source_files)
+kernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_kernel', source=source_files)