== 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, 26 deletions

diff --git a/intern/csg/SConscript b/intern/csg/SConscript
index e06cd2c73e6..84d718e5b67 100644
--- a/intern/csg/SConscript
+++ b/intern/csg/SConscript
@@ -1,30 +1,8 @@
 #!/usr/bin/python
-csg_env = Environment()
+Import('env')
 
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
-csg_env.Append (CCFLAGS = cflags)
-csg_env.Append (CXXFLAGS = cxxflags)
-csg_env.Append (CPPDEFINES = defines)
+sources = env.Glob('intern/*.cpp') + env.Glob('intern/*.inl')
 
-source_files = ['intern/CSG_BBoxTree.cpp',
-				'intern/CSG_ConnectedMeshWrapper.inl',
-				'intern/CSG_Math.inl',
-				'intern/CSG_Triangulate.inl',
-				'intern/blender/CSG_CsgOp.cpp',
-				'intern/blender/CSG_Interface.cpp',
-				'intern/CSG_BooleanOp.inl',
-				'intern/CSG_MeshWrapper.inl',
-				'intern/MT_Line3.cpp'
-				]
+incs = 'intern ../container ../moto/include ../memutil intern/blender extern'
 
-csg_env.Append (CPPPATH = ['intern',
-                           '../container',
-                           '../moto/include',
-                           '../memutil',
-                           'intern/blender',
-                           'extern'])
-
-csg_env.Library (target='#/lib/blender_BSP', source=source_files)
+env.BlenderLib ('blender_BSP', sources, Split(incs) , [], libtype='blender', priority=15)