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

diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript
index f47611bbb13..dafbb865bf6 100644
--- a/source/blender/quicktime/SConscript
+++ b/source/blender/quicktime/SConscript
@@ -1,26 +1,22 @@
 #!/usr/bin/python
-Import ('extra_includes')
-Import ('user_options_dict')
-Import ('library_env')
-
-quicktime_env = library_env.Copy ()
-
-quicktime_env.Append (CPPPATH = extra_includes)
+Import ('env')
 
 source_files = ['apple/quicktime_import.c',
                 'apple/quicktime_export.c']
 
-quicktime_env.Append (CPPPATH = ['.',
-                                 '../quicktime',
-                                 '../makesdna',
-                                 '#/intern/guardedalloc',
-                                 '../blenlib',
-                                 '../blenkernel',
-                                 '../avi',
-                                 '../imbuf',
-                                 '../imbuf/intern',
-                                 '../blenloader',
-                                 '../render/extern/include',
-                                 '../include'])
+incs  = ['.',
+		 '../quicktime',
+		 '../makesdna',
+		 '#/intern/guardedalloc',
+		 '../blenlib',
+		 '../blenkernel',
+		 '../avi',
+		 '../imbuf',
+		 '../imbuf/intern',
+		 '../blenloader',
+		 '../render/extern/include',
+		 '../include']
+
+incs.append(env['BF_QUICKTIME_INC'])
 
-quicktime_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_quicktime', source=source_files)
+env.BlenderLib ('blender_quicktime', sources=source_files, includes=incs, defines=['WITH_QUICKTIME'], libtype='core', priority=95)