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

diff --git a/extern/SConscript b/extern/SConscript
index d11db23ab7a..15cace23c6c 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -1,14 +1,10 @@
 #!/usr/bin/python
 
-Import('user_options_dict')
+Import('env')
 
-
-print "externs..."
 SConscript(['qhull/SConscript',
-            'solid/SConscript',
-	    'bullet/SConscript'])
-            
-            
-if user_options_dict['USE_INTERNATIONAL'] == 1:
-    print "bftgl"
-    SConscript(['bFTGL/SConscript'])
\ No newline at end of file
+			'solid/SConscript',
+			'bullet/SConscript'])
+
+if env['WITH_BF_FREETYPE'] == 1:
+    SConscript(['bFTGL/SConscript'])