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.

1 files changed, 4 insertions, 2 deletions

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)