SCons updates

* All output is now generated in a seperate directory. By default this is
  ../build/
  Currently all .lib / .a files are still build in lib/
  So, I guess I need to update all SConscript files to build the lib now also
  in the build_dir. TODO
* User configurable options have been added.
  When running SCons for the first time, a new config.opts file is generated.
  The defaults are taken from each section currently in SConstruct.
  Currently implemented options:
  - VERSION             // Blender version. not used at the moment
  - BUILD_BINARY        // release or debug
  - BUILD_DIR           // target directory to build intermediate files
  - USE_INTERNATIONAL   // true or false
  - BUILD_GAMEENGINE    // true or false
  - USE_PHYSICS         // ode or solid
  - USE_OPENAL          // true or false
  - USE_FMOD            // true or false
  - USE_QUICKTIME       // true or false

  Note that all options are strings, so quotes are necessary (')

  There's currently some duplicate code in the SConstruct and SConscript
  files, but this currently works and cleanup can be done in small steps
  afterwards.

* Disabled international support on Linux by default for now.
  There is something wrong with this currently. I'll fix it in the near
  future.

1 files changed, 5 insertions, 7 deletions

diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 03a2dbd5473..f636b228a63 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -6,6 +6,7 @@ Import ('defines')
 Import ('platform_libs')
 Import ('platform_libpath')
 Import ('platform_linkflags')
+Import ('root_build_dir')
 
 if sys.platform=='win32':
     platform_linkflags = ['/SUBSYSTEM:CONSOLE',
@@ -34,15 +35,12 @@ makesdna_tool.Append (CPPDEFINES = defines)
 makesdna_tool.Append (LINKFLAGS = platform_linkflags)
 makesdna_tool.Append (LIBPATH = '#/lib')
 makesdna_tool.Append (LIBS = 'blender_guardedalloc')
-makesdna_tool.Program (target = 'makesdna', source = source_files)
+makesdna_tool.Program (target = '#'+root_build_dir+'makesdna', source = source_files)
 
 dna = Environment ()
 dna_dict = dna.Dictionary()
-makesdna_name = 'makesdna' + dna_dict['PROGSUFFIX']
-dna.Depends ('dna.c', makesdna_name)
-if sys.platform=='win32':
-    dna.Command ('dna.c', '', "source\\blender\\makesdna\\intern\\makesdna $TARGET")
-else:
-    dna.Command ('dna.c', '', "source/blender/makesdna/intern/makesdna $TARGET")
+makesdna_name = root_build_dir+'makesdna' + dna_dict['PROGSUFFIX']
+dna.Depends ('dna.c', '#'+makesdna_name)
+dna.Command ('dna.c', '', root_build_dir+"makesdna $TARGET")
 obj = 'intern/dna.c'
 Return ('obj')