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

diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript
index 1563a3cd319..6dc3deb7109 100644
--- a/intern/bsp/SConscript
+++ b/intern/bsp/SConscript
@@ -1,25 +1,8 @@
 #!/usr/bin/python
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-bsp_env = library_env.Copy ()
+sources = env.Glob('intern/*.cpp')
 
-source_files = ['intern/BSP_CSGHelper.cpp',
-                'intern/BSP_CSGMesh.cpp',
-                'intern/BSP_CSGMeshBuilder.cpp',
-                'intern/BSP_CSGMeshSplitter.cpp',
-                'intern/BSP_CSGNCMeshSplitter.cpp',
-                'intern/BSP_CSGUserData.cpp',
-                'intern/BSP_FragNode.cpp',
-                'intern/BSP_FragTree.cpp',
-                'intern/BSP_MeshFragment.cpp',
-                'intern/BSP_MeshPrimitives.cpp',
-                'intern/BSP_Triangulate.cpp',
-                'intern/CSG_BooleanOps.cpp']
+incs = 'intern ../container ../moto/include ../memutil'
 
-bsp_env.Append (CPPPATH = ['intern',
-                           '../container',
-                           '../moto/include',
-                           '../memutil'])
-
-bsp_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BSP', source=source_files)
+env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=15 )