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

diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript
index 0c7205e6a83..102f79683f9 100644
--- a/source/blender/radiosity/SConscript
+++ b/source/blender/radiosity/SConscript
@@ -1,26 +1,12 @@
 #!/usr/bin/python
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-rad_env = library_env.Copy ()
+sources = env.Glob('intern/source/*.c')
 
-source_files = ['intern/source/raddisplay.c',
-                'intern/source/radfactors.c',
-                'intern/source/radrender.c',
-                'intern/source/radio.c',
-                'intern/source/radnode.c',
-                'intern/source/radpostprocess.c',
-                'intern/source/radpreprocess.c']
+incs = 'extern/include ../blenlib ../blenkernel ../makesdna ../include'
+incs += ' #/intern/guardedalloc ../render/extern/include'
+incs += ' ../render/intern/include'
 
-rad_env.Append (CPPPATH = ['extern/include',
-                           '../blenlib',
-                           '../blenkernel',
-                           '../makesdna',
-                           '../include',
-                           '#/intern/guardedalloc',
-                           '../render/extern/include',
-                           '../render/intern/include'])
+incs += ' ' + env['BF_OPENGL_INC']
 
-rad_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
-
-rad_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_radiosity', source=source_files)
+env.BlenderLib ( 'blender_radiosity', sources, Split(incs), [], libtype='core', priority=50 )