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

diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript
index 5504965b1c9..a201cbae125 100644
--- a/extern/bFTGL/SConscript
+++ b/extern/bFTGL/SConscript
@@ -2,52 +2,29 @@
 import sys
 import os
 
-ftgl_env = Environment(ENV=os.environ)
+Import('env')
 
 # Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('defines')
-Import ('user_options_dict')
+#Import ('cflags')
+#Import ('defines')
+#Import ('user_options_dict')
 
-if sys.platform=='linux2' or sys.platform=='linux-i386':
-	ftgl_env.Append (CCFLAGS = ['-O2', '-ansi'])
-elif sys.platform=='win32':
-	ftgl_env.Append (CCFLAGS = ['/O2'])
-elif sys.platform=='sunos':
-	ftgl_env.Append (CCFLAGS = ['Xc', '-v', '-fast'])
-elif sys.platform=='darwin':
-	ftgl_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'])
-else:
-	ftgl_env.Append (CCFLAGS = cflags)
+#if sys.platform=='linux2' or sys.platform=='linux-i386':
+#	ftgl_env.Append (CCFLAGS = ['-O2', '-ansi'])
+#elif sys.platform=='win32':
+	#ftgl_env.Append (CCFLAGS = ['/O2'])
+#elif sys.platform=='sunos':
+#	ftgl_env.Append (CCFLAGS = ['Xc', '-v', '-fast'])
+#elif sys.platform=='darwin':
+#	ftgl_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4'])
+#else:
+#	ftgl_env.Append (CCFLAGS = cflags)
 
-ftgl_env.Append (CPPDEFINES = defines)
-ftgl_env.Append (CPPPATH = ['include',
-                             'src'])
+#ftgl_env.Append (CPPDEFINES = defines)
 
-ftgl_env.Append (CPPPATH = user_options_dict['FREETYPE_INCLUDE'])
+incs = 'include src ' + env['BF_FREETYPE_INC']
+defs = ''
 
-source_files = [
-		'src/FTBitmapGlyph.cpp',
-		'src/FTCharmap.cpp',
-		'src/FTContour.cpp',
-		'src/FTExtrdGlyph.cpp',
-		'src/FTFace.cpp',
-		'src/FTFont.cpp',
-		'src/FTGLBitmapFont.cpp',
-		'src/FTGLExtrdFont.cpp',
-		'src/FTGLOutlineFont.cpp',
-		'src/FTGLPixmapFont.cpp',
-		'src/FTGLPolygonFont.cpp',
-		'src/FTGLTextureFont.cpp',
-		'src/FTGlyph.cpp',
-		'src/FTGlyphContainer.cpp',
-		'src/FTLibrary.cpp',
-		'src/FTOutlineGlyph.cpp',
-		'src/FTPixmapGlyph.cpp',
-		'src/FTPoint.cpp',
-		'src/FTPolyGlyph.cpp',
-		'src/FTSize.cpp',
-		'src/FTTextureGlyph.cpp',
-		'src/FTVectoriser.cpp']
+sources = env.Glob('src/*.cpp')
 
-ftgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_ftgl', source=source_files)
+env.BlenderLib ( 'extern_ftgl', sources, Split(incs), Split(defs), libtype='international', priority=5)