== SCons ==

* This commit is all of the rewrite work done on the SCons system. For
  documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt.
  Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring
  contains valuable information, along with what still needs to be done.

    - linux, os x and windows compile now.
    - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py)
        - NOTE: Jean-Luc P will commit sometime during the weekend proper
          appit() for OS X. For now, copy the resulting binary to an
          existing .app bundle.
    - features:
        - cleaner structure for better maintenance
        - cleaner output during compile
        - better handling of build options
        - general overall speed increase
        - see the wiki for more info

  Cygwin, FreeBSD and Solaris systems still need work. For these systems:
    1) copy a config/(platform)-config.py to ie. config/cygwin-config.py
    2) set the proper defaults for your platform
    3) mail me at jesterking at letwory dot net with you configuration. if
       you need any modifications to the system, do send a patch, too.

  I'll be giving first-aid today and tomorrow, after that it'll be all
  regular development work :)

  /Nathan

1 files changed, 6 insertions, 14 deletions

diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index cb1dc0decbe..373f50f1232 100644
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -1,18 +1,10 @@
 #!/usr/bin/python
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-kernel_env = library_env.Copy ()
+sources = 'gen_messaging/intern/messaging.c gen_system/GEN_HashedPtr.cpp'
+sources += ' gen_system/GEN_Matrix4x4.cpp gen_system/SYS_SingletonSystem.cpp'
+sources += ' gen_system/SYS_System.cpp'
 
-source_files = ['gen_messaging/intern/messaging.c',
-                'gen_system/GEN_HashedPtr.cpp',
-                'gen_system/GEN_Matrix4x4.cpp',
-                'gen_system/SYS_SingletonSystem.cpp',
-                'gen_system/SYS_System.cpp']
+incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include'
 
-kernel_env.Append (CPPPATH = ['gen_messaging',
-                              'gen_system',
-                              '#/intern/string',
-                              '#/intern/moto/include'])
-
-kernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_kernel', source=source_files)
+env.BlenderLib ( 'blender_kernel', Split(sources), Split(incs), [], libtype = ['common','game2'], priority = [15, 10] )