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

diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript
index 4e0260c7f33..b1cbdeb8ba3 100644
--- a/intern/opennl/SConscript
+++ b/intern/opennl/SConscript
@@ -1,43 +1,9 @@
-Import ('user_options_dict')
-Import ('library_env')
+#!/usr/bin/python
+Import ('env')
 
-opennl_env = library_env.Copy ()
+sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
 
-source_files = ['intern/opennl.c',
-                'superlu/colamd.c',
-                'superlu/get_perm_c.c',
-                'superlu/heap_relax_snode.c',
-                'superlu/lsame.c',
-                'superlu/memory.c',
-                'superlu/mmd.c',
-                'superlu/relax_snode.c',
-                'superlu/scolumn_bmod.c',
-                'superlu/scolumn_dfs.c',
-                'superlu/scopy_to_ucol.c',
-                'superlu/sgssv.c',
-                'superlu/sgstrf.c',
-                'superlu/sgstrs.c',
-                'superlu/smemory.c',
-                'superlu/smyblas2.c',
-                'superlu/sp_coletree.c',
-                'superlu/sp_ienv.c',
-                'superlu/sp_preorder.c',
-                'superlu/spanel_bmod.c',
-                'superlu/spanel_dfs.c',
-                'superlu/spivotL.c',
-                'superlu/spruneL.c',
-                'superlu/ssnode_bmod.c',
-                'superlu/ssnode_dfs.c',
-                'superlu/ssp_blas2.c',
-                'superlu/ssp_blas3.c',
-                'superlu/strsv.c',
-                'superlu/superlu_timer.c',
-                'superlu/sutil.c',
-                'superlu/util.c',
-                'superlu/xerbla.c']
+incs = 'extern superlu'
 
-opennl_env.Append (CPPPATH = ['extern',
-                              'superlu'])
-
-opennl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_ONL', source=source_files)
+env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype='core', priority=55 )