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

diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 361aeed4120..82a059ea050 100755
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -1,67 +1,25 @@
 #!/usr/bin/python
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-kx_converter_env = library_env.Copy ()
+sources = env.Glob('*.cpp')
 
-source_files = ['KX_IpoConvert.cpp',
-                'KX_ConvertSensors.cpp',
-                'KX_ConvertProperties.cpp',
-                'KX_ConvertControllers.cpp',
-                'KX_ConvertActuators.cpp',
-                'KX_BlenderSceneConverter.cpp',
-                'KX_BlenderScalarInterpolator.cpp',
-                'BlenderWorldInfo.cpp',
-                'BL_SkinMeshObject.cpp',
-                'BL_SkinDeformer.cpp',
-                'BL_MeshDeformer.cpp',
-                'BL_DeformableGameObject.cpp',
-                'BL_BlenderDataConversion.cpp',
-                'BL_ArmatureObject.cpp',
-                'BL_ActionActuator.cpp'
-                ]
+incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
+incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
+incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal'
+incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter'
+incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf'
+incs += ' #intern/moto/include #source/gameengine/Ketsji #source/gameengine/Ketsji/KXNetwork'
+incs += ' #source/blender/blenlib #source/blender/blenkernel #source/blender'
+incs += ' #source/blender/include #source/blender/makesdna #source/gameengine/Rasterizer'
+incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #source/gameengine/GameLogic'
+incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/gameengine/SceneGraph'
+incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet #source/gameengine/Physics/BlOde'
+incs += ' #source/gameengine/Physics/Dummy #source/gameengine/Physics/Sumo'
+incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
+incs += ' #source/blender/misc #source/blender/blenloader'
 
-kx_converter_env.Append (CPPPATH = ['.',
-                                    '#source/kernel/gen_system',
-                                    '#intern/string',
-                                    '#intern/guardedalloc',
-                                    '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
-                                    '#intern/bmfont',
-                                    '#intern/SoundSystem',
-                                    '#intern/SoundSystem/include',
-                                    '#intern/SoundSystem/openal',
-                                    '#intern/SoundSystem/dummy',
-                                    '#intern/SoundSystem/intern',
-                                    '#source/gameengine/Converter',
-                                    '#source/gameengine/BlenderRoutines',
-                                    '#source/blender/imbuf',
-                                    '#intern/moto/include',
-                                    '#source/gameengine/Ketsji',
-                                    '#source/gameengine/Ketsji/KXNetwork',
-                                    '#source/blender/blenlib',
-                                    '#source/blender/blenkernel',
-                                    '#source/blender',
-                                    '#source/blender/include',
-                                    '#source/blender/makesdna',
-                                    '#source/gameengine/Rasterizer',
-				    '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
-                                    '#source/gameengine/GameLogic',
-                                    '#source/gameengine/Expressions',
-                                    '#source/gameengine/Network',
-                                    '#source/gameengine/SceneGraph',
-                                    '#source/gameengine/Physics/common',
-                                    '#source/gameengine/Physics/Bullet',
-                                    '#source/gameengine/Physics/BlOde',
-                                    '#source/gameengine/Physics/Dummy',
-                                    '#source/gameengine/Physics/Sumo',
-                                    '#source/gameengine/Physics/Sumo/Fuzzics/include',
-                                    '#source/gameengine/Network/LoopBackNetwork',
-                                    '#source/blender/misc',
-                                    '#source/blender/blenloader'
-                                    ])
+incs += ' ' + env['BF_PYTHON_INC']
+incs += ' ' + env['BF_SOLID_INC']
+incs += ' ' + env['BF_BULLET_INC']
 
-kx_converter_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
-kx_converter_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE'])
-kx_converter_env.Append (CPPPATH = user_options_dict['BULLET_INCLUDE'])
-
-kx_converter_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_converter', source=source_files)
+env.BlenderLib ( 'KX_converter', sources, Split(incs), [], libtype='game', priority=5 )