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

diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index c73c0593a86..938e306e7f6 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -1,56 +1,23 @@
 #!/usr/bin/python
-Import ('extra_includes')
-Import ('user_options_dict')
-Import ('library_env')
+Import ('env')
 
-imbuf_env = library_env.Copy ()
+sources = env.Glob('intern/*.c')
 
-#if user_options_dict['USE_OPENEXR'] == 1:
-#    SConscript (['intern/openexr/SConscript'])
+incs = '. ../makesdna #/intern/guardedalloc ../blenlib'
+incs += ' ../avi ../quicktime ../blenkernel'
 
-source_files = ['intern/allocimbuf.c',
-                'intern/amiga.c',
-                'intern/anim.c',
-                'intern/anim5.c',
-                'intern/antialias.c',
-                'intern/bitplanes.c',
-                'intern/bmp.c',
-                'intern/cmap.c',
-                'intern/cspace.c',
-                'intern/data.c',
-                'intern/dither.c',
-                'intern/divers.c',
-                'intern/dynlibtiff.c',
-                'intern/filter.c',
-                'intern/ham.c',
-                'intern/hamx.c',
-                'intern/iff.c',
-                'intern/imageprocess.c',
-                'intern/iris.c',
-                'intern/jpeg.c',
-                'intern/png.c',
-                'intern/radiance_hdr.c',
-                'intern/readimage.c',
-                'intern/rectop.c',
-                'intern/rotate.c',
-                'intern/scaling.c',
-                'intern/targa.c',
-                'intern/tiff.c',
-                'intern/util.c',
-                'intern/writeimage.c']
+incs += ' ' + env['BF_JPEG_INC']
+incs += ' ' + env['BF_PNG_INC']
+incs += ' ' + env['BF_TIFF_INC']
+incs += ' ' + env['BF_ZLIB_INC']
 
-imbuf_env.Append (CPPPATH = ['.',
-                             '../imbuf',
-                             '../makesdna',
-                             '#/intern/guardedalloc',
-                             '../blenlib',
-                             '../avi',
-                             '../quicktime',
-                             '../blenkernel'])
+defs = []
 
-imbuf_env.Append (CPPPATH = user_options_dict['JPEG_INCLUDE'])
-imbuf_env.Append (CPPPATH = user_options_dict['PNG_INCLUDE'])
-imbuf_env.Append (CPPPATH = user_options_dict['TIFF_INCLUDE'])
-imbuf_env.Append (CPPPATH = user_options_dict['Z_INCLUDE'])
-imbuf_env.Append (CPPPATH = extra_includes)
-imbuf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_imbuf', source=source_files)
+if env['WITH_BF_OPENEXR'] == 1:
+    defs.append('WITH_OPENEXR')
+
+if env['WITH_BF_QUICKTIME']==1:
+	incs += ' ' + env['BF_QUICKTIME_INC']
+	defs.append('WITH_QUICKTIME')
+
+env.BlenderLib ( libname = 'blender_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype='core', priority = 80 )