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.

SConstruct

@@ -368,69 +368,29 @@ user_options.AddOptions (
                      allowed_values = ('release', 'debug'))),
     )
 user_options.Update (user_options_env)
-user_dict = user_options_env.Dictionary()
+user_options_dict = user_options_env.Dictionary()
 
-root_build_dir = user_dict['BUILD_DIR']
+root_build_dir = user_options_dict['BUILD_DIR']
-if user_dict['USE_INTERNATIONAL'] == 1:
-    use_international = 'true'
-else:
-    use_international = 'false'
     
-if user_dict['USE_PHYSICS'] == 'ode':
+if user_options_dict['BUILD_GAMEENGINE'] == 1:
-    use_ode = 'true'
-    use_sumo = 'false'
-else:
-    use_ode = 'false'
-    use_sumo = 'true'
-
-if user_dict['BUILD_GAMEENGINE']:
-    use_gameengine = 'true'
     defines += ['GAMEBLENDER=1']
+    if user_options_dict['USE_PHYSICS'] == 'ode':
+        defines += ['USE_ODE']
+    else:
+        defines += ['USE_SUMO_SOLID']
 else:
-    use_gameengine = 'false'
     defines += ['GAMEBLENDER=0']
 
-if user_dict['USE_OPENAL'] == 1:
+if user_options_dict['BUILD_BINARY'] == 'release':
-    use_openal = 'true'
-else:
-    use_openal = 'false'
-
-if user_dict['USE_FMOD'] == 1:
-    use_fmod = 'true'
-else:
-    use_fmod = 'false'
-
-if user_dict['USE_QUICKTIME'] == 1:
-    use_quicktime = 'true'
-else:
-    use_quicktime = 'false'
-
-if user_dict['BUILD_BINARY'] == 'release':
     cflags = extra_flags + release_flags + warn_flags
 else:
     cflags = extra_flags + debug_flags + warn_flags
 
-#-----------------------------------------------------------------------------
-# Game Engine settings
-#-----------------------------------------------------------------------------
-if use_gameengine == 'true':
-    if use_sumo == 'true':
-        defines += ['USE_SUMO_SOLID']
-    if use_ode == 'true':
-        defines += ['USE_ODE']
-
 #-----------------------------------------------------------------------------
 # Settings to be exported to other SConscript files
 #-----------------------------------------------------------------------------
 cflags = extra_flags + release_flags + warn_flags
 
-Export ('use_international')
-Export ('use_gameengine')
-Export ('use_openal')
-Export ('use_fmod')
-Export ('use_quicktime')
-Export ('use_ode')
-Export ('use_sumo')
 Export ('python_include')
 Export ('cflags')
 Export ('defines')
@@ -445,13 +405,14 @@ Export ('platform_libs')
 Export ('platform_libpath')
 Export ('platform_linkflags')
 Export ('root_build_dir')
+Export ('user_options_dict')
 
 BuildDir (root_build_dir+'/intern', 'intern', duplicate=0)
 SConscript (root_build_dir+'intern/SConscript')
 BuildDir (root_build_dir+'/source', 'source', duplicate=0)
 SConscript (root_build_dir+'source/SConscript')
 
-libpath = (['lib'])
+libpath = (['#'+root_build_dir+'/lib'])
 
 libraries = (['blender_render',
               'blender_yafray',

intern/SoundSystem/SConscript

@@ -7,8 +7,7 @@ soundsys_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
-Import ('use_openal')
+Import ('user_options_dict')
-Import ('use_fmod')
 Import ('extra_includes')
 
 soundsys_env.Append (CCFLAGS = cflags)
@@ -34,20 +33,19 @@ soundsys_env.Append (CPPPATH = ['.',
                                 'dummy',
                                 'openal'])
 
-if use_openal == 'true':
+if user_options_dict['USE_OPENAL'] == 1:
     source_files += ['openal/SND_OpenALDevice.cpp',
                      'openal/pthread_cancel.cpp']
     if sys.platform=='win32':
         defines += ['_LIB']
         soundsys_env.Append(CPPDEFINES = defines)
         
-
+if user_options_dict['USE_FMOD'] == 1:
-if use_fmod == 'true':
     source_files += ['fmod/SND_FmodDevice.cpp']
 
-if use_openal == 'false' and use_fmod == 'false':
+if user_options_dict['USE_OPENAL'] == 0 and user_options_dict['USE_FMOD'] == 0:
     soundsys_env.Append (CPPDEFINES = 'NO_SOUND')
 
 soundsys_env.Append (CPPPATH = extra_includes)
 
-soundsys_env.Library (target='#/lib/soundsystem', source=source_files)
+soundsys_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/soundsystem', source=source_files)

intern/bmfont/SConscript

@@ -4,6 +4,7 @@ bmfont_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 bmfont_env.Append (CCFLAGS = cflags)
 bmfont_env.Append (CXXFLAGS = cxxflags)
 bmfont_env.Append (CPPDEFINES = defines)
@@ -23,4 +24,4 @@ source_files = ['intern/BMF_Api.cpp',
 bmfont_env.Append (CPPPATH = ['.',
                               'intern'])
 
-bmfont_env.Library (target='#/lib/blender_BMF', source=source_files)
+bmfont_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BMF', source=source_files)

intern/bsp/SConscript

@@ -4,6 +4,7 @@ bsp_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 bsp_env.Append (CCFLAGS = cflags)
 bsp_env.Append (CXXFLAGS = cxxflags)
 bsp_env.Append (CPPDEFINES = defines)
@@ -26,4 +27,4 @@ bsp_env.Append (CPPPATH = ['intern',
                            '../moto/include',
                            '../memutil'])
 
-bsp_env.Library (target='#/lib/blender_BSP', source=source_files)
+bsp_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BSP', source=source_files)

intern/container/SConscript

@@ -4,6 +4,7 @@ cont_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 cont_env.Append (CCFLAGS = cflags)
 cont_env.Append (CXXFLAGS = cxxflags)
 cont_env.Append (CPPDEFINES = defines)
@@ -12,4 +13,4 @@ source_files = ['intern/CTR_List.cpp']
 
 cont_env.Append (CPPPATH = ['.'])
 
-cont_env.Library (target='#/lib/blender_CTR', source=source_files)
+cont_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_CTR', source=source_files)

intern/decimation/SConscript

@@ -4,6 +4,7 @@ dec_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 dec_env.Append (CCFLAGS = cflags)
 dec_env.Append (CXXFLAGS = cxxflags)
 dec_env.Append (CPPDEFINES = defines)
@@ -23,4 +24,4 @@ dec_env.Append (CPPPATH = ['intern',
                            '../container',
                            '../memutil'])
 
-dec_env.Library (target='#/lib/blender_LOD', source=source_files)
+dec_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_LOD', source=source_files)

intern/ghost/SConscript

@@ -4,12 +4,12 @@ ghost_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
+Import ('window_system')
 ghost_env.Append (CCFLAGS = cflags)
 ghost_env.Append (CXXFLAGS = cxxflags)
 ghost_env.Append (CPPDEFINES = defines)
 
-Import ('window_system')
-
 source_files = ['intern/GHOST_Buttons.cpp',
                 'intern/GHOST_C-api.cpp',
                 'intern/GHOST_CallbackEventConsumer.cpp',
@@ -42,4 +42,4 @@ else:
 ghost_env.Append (CPPPATH = ['.',
                              '../string'])
 
-ghost_env.Library (target='#/lib/blender_GHOST', source=source_files)
+ghost_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_GHOST', source=source_files)

intern/guardedalloc/SConscript

@@ -4,6 +4,7 @@ guardal_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 guardal_env.Append (CCFLAGS = cflags)
 guardal_env.Append (CXXFLAGS = cxxflags)
 guardal_env.Append (CPPDEFINES = defines)
@@ -12,4 +13,4 @@ source_files = ['intern/mallocn.c']
 
 guardal_env.Append (CPPPATH = ['.'])
 
-guardal_env.Library (target='#/lib/blender_guardedalloc', source=source_files)
+guardal_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_guardedalloc', source=source_files)

intern/iksolver/SConscript

@@ -4,6 +4,7 @@ iksolver_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 iksolver_env.Append (CCFLAGS = cflags)
 iksolver_env.Append (CXXFLAGS = cxxflags)
 iksolver_env.Append (CPPDEFINES = defines)
@@ -18,4 +19,4 @@ iksolver_env.Append (CPPPATH = ['intern',
                                 '../moto/include',
                                 '../memutil'])
 
-iksolver_env.Library (target='#/lib/blender_IK', source=source_files)
+iksolver_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_IK', source=source_files)

intern/memutil/SConscript

@@ -4,6 +4,7 @@ memutil_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 memutil_env.Append (CCFLAGS = cflags)
 memutil_env.Append (CXXFLAGS = cxxflags)
 memutil_env.Append (CPPDEFINES = defines)
@@ -12,4 +13,4 @@ source_files = ['intern/MEM_RefCountedC-Api.cpp']
 
 memutil_env.Append (CPPPATH = ['.'])
 
-memutil_env.Library (target='#/lib/blender_MEM', source=source_files)
+memutil_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_MEM', source=source_files)

intern/moto/SConscript

@@ -4,6 +4,7 @@ moto_env = Environment()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 moto_env.Append (CCFLAGS = cflags)
 moto_env.Append (CXXFLAGS = cxxflags)
 moto_env.Append (CPPDEFINES = defines)
@@ -22,4 +23,4 @@ source_files = ['intern/MT_CmMatrix4x4.cpp',
 
 moto_env.Append (CPPPATH = ['include'])
 
-moto_env.Library (target='#/lib/blender_MT', source=source_files)
+moto_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_MT', source=source_files)

intern/string/SConscript

@@ -4,6 +4,7 @@ string_env = Environment ()
 Import ('cflags')
 Import ('cxxflags')
 Import ('defines')
+Import ('user_options_dict')
 string_env.Append (CCFLAGS = cflags)
 string_env.Append (CXXFLAGS = cxxflags)
 string_env.Append (CPPDEFINES = defines)
@@ -12,4 +13,4 @@ source_files = ['intern/STR_String.cpp']
 
 string_env.Append (CPPPATH = ['.'])
 
-string_env.Library (target='#/lib/blender_STR', source=source_files)
+string_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_STR', source=source_files)

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'])

source/blender/SConscript

@@ -1,29 +1,28 @@
-Import ('use_quicktime')
+Import ('user_options_dict')
-Import ('use_international')
 
-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',
+            'inflate/SConscript',
-            'radiosity/SConscript',
-            'blenlib/SConscript',
-            'blenkernel/SConscript',
-            'blenpluginapi/SConscript',
-            'python/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'])

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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')

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

source/gameengine/SConscript

@@ -1,22 +1,21 @@
-Import ('use_ode')
+Import ('user_options_dict')
-Import ('use_sumo')
 
-SConscript(['Ketsji/SConscript',
+SConscript(['BlenderRoutines/SConscript',
-            'Ketsji/KXNetwork/SConscript',
-            'Expressions/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'])

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)

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)