== 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, 5 insertions, 30 deletions

diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index 212381cc034..2fd3bf6fe75 100755
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -1,34 +1,9 @@
 #!/usr/bin/python
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-expressions_env = library_env.Copy ()
+sources = env.Glob('*.cpp')
 
-source_files = ['BoolValue.cpp',
-                'ConstExpr.cpp',
-                'EmptyValue.cpp',
-                'ErrorValue.cpp',
-                'EXP_C-Api.cpp',
-                'Expression.cpp',
-                'FloatValue.cpp',
-                'IdentifierExpr.cpp',
-                'IfExpr.cpp',
-                'InputParser.cpp',
-                'IntValue.cpp',
-                'KX_HashedPtr.cpp',
-                'ListValue.cpp',
-                'Operator1Expr.cpp',
-                'Operator2Expr.cpp',
-                'PyObjectPlus.cpp',
-                'StringValue.cpp',
-                'Value.cpp',
-                'VectorValue.cpp']
+incs ='. #source/kernel/gen_system #intern/string #intern/moto/include'
+incs += ' ' + env['BF_PYTHON_INC']
 
-expressions_env.Append (CPPPATH = ['.',
-                                   '#source/kernel/gen_system',
-                                   '#intern/string',
-				   '#intern/moto/include'])
-
-expressions_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
-
-expressions_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_expressions', source=source_files)
+env.BlenderLib ( 'blender_expressions', sources, Split(incs), [], libtype='game', priority = 45 )