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

diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript
index a0df706e9f7..afd4ff24d6e 100644
--- a/intern/boolop/SConscript
+++ b/intern/boolop/SConscript
@@ -1,34 +1,8 @@
 #!/usr/bin/python
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-bop_env = library_env.Copy ()
+sources = env.Glob('intern/*.cpp')
 
-source_files = [
-		'intern/BOP_BBox.cpp',
-		'intern/BOP_BSPNode.cpp',
-		'intern/BOP_BSPTree.cpp',
-		'intern/BOP_Edge.cpp',
-		'intern/BOP_Face.cpp',
-		'intern/BOP_Face2Face.cpp',
-		'intern/BOP_Interface.cpp',
-		'intern/BOP_Material.cpp',
-		'intern/BOP_MaterialContainer.cpp',
-		'intern/BOP_MathUtils.cpp',
-		'intern/BOP_Merge.cpp',
-		'intern/BOP_Mesh.cpp',
-		'intern/BOP_Segment.cpp',
-		'intern/BOP_Splitter.cpp',
-		'intern/BOP_Tag.cpp',
-		'intern/BOP_Triangulator.cpp',
-		'intern/BOP_Vertex.cpp'
-		]
+incs = '. intern extern ../moto/include ../container ../memutil'
 
-bop_env.Append (CPPPATH = [	'.',
-							'intern',
-							'extern',
-							'#intern/moto/include',
-							'#intern/container',
-							'#intern/memutil'])
-
-bop_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_bop', source=source_files)
+env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )