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

diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index 928667ea4c1..126c84eecb2 100755
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -1,48 +1,12 @@
 #!/usr/bin/python
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-sca_gamelogic_env = library_env.Copy ()
+sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp')
 
-source_files = ['SCA_ANDController.cpp',
-                'SCA_AlwaysEventManager.cpp',
-                'SCA_AlwaysSensor.cpp',
-                'SCA_EventManager.cpp',
-                'SCA_ExpressionController.cpp',
-                'SCA_IActuator.cpp',
-                'SCA_IController.cpp',
-                'SCA_IInputDevice.cpp',
-                'SCA_ILogicBrick.cpp',
-                'SCA_IObject.cpp',
-                'SCA_IScene.cpp',
-                'SCA_ISensor.cpp',
-		'SCA_JoystickManager.cpp',
-		'SCA_JoystickSensor.cpp',
-                'SCA_KeyboardManager.cpp',
-                'SCA_KeyboardSensor.cpp',
-                'SCA_LogicManager.cpp',
-                'SCA_MouseManager.cpp',
-                'SCA_MouseSensor.cpp',
-                'SCA_ORController.cpp',
-                'SCA_PropertyActuator.cpp',
-                'SCA_PropertyEventManager.cpp',
-                'SCA_PropertySensor.cpp',
-                'SCA_PythonController.cpp',
-                'SCA_RandomActuator.cpp',
-                'SCA_RandomEventManager.cpp',
-                'SCA_RandomNumberGenerator.cpp',
-                'SCA_RandomSensor.cpp',
-                'SCA_TimeEventManager.cpp',
-		'Joystick/SCA_Joystick.cpp',
-		'Joystick/SCA_JoystickEvents.cpp']
+incs = '. #/source/kernel/gen_system #/intern/string'
+incs += ' #/source/gameengine/Expressions #/intern/moto/include'
 
-sca_gamelogic_env.Append (CPPPATH=['.',
-                                   '#/source/kernel/gen_system',
-                                   '#/intern/string',
-                                   '#/source/gameengine/Expressions',
-                                   '#/intern/moto/include'])
+incs += ' ' + env['BF_PYTHON_INC']
+incs += ' ' + env['BF_SDL_INC']
 
-sca_gamelogic_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
-sca_gamelogic_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
-
-sca_gamelogic_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/SCA_GameLogic', source=source_files)
+env.BlenderLib ( 'SCA_GameLogic', sources, Split(incs), [], libtype='game', priority=30 )