* integrate bFTGL with Scons

* add some ENV = os.environ's here and there (help those who have msvc toolkit installed)

Note for OSX users: check from your config.opts the correct info for the precompiled ftgl lib is used.

4 files changed, 69 insertions, 3 deletions

diff --git a/extern/SConscript b/extern/SConscript
index 4d58ee6447d..f5f4267988d 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -1,3 +1,13 @@
 #!/usr/bin/python
+
+Import('user_options_dict')
+
+
+print "externs..."
 SConscript(['qhull/SConscript',
-            'solid/SConscript'])
\ No newline at end of file
+            'solid/SConscript'])
+            
+            
+if user_options_dict['USE_INTERNATIONAL'] == 1:
+    print "bftgl"
+    SConscript(['bFTGL/SConscript'])
\ No newline at end of file
diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript
new file mode 100644
index 00000000000..5504965b1c9
--- /dev/null
+++ b/extern/bFTGL/SConscript
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+import sys
+import os
+
+ftgl_env = Environment(ENV=os.environ)
+
+# Import the C flags set in the SConstruct file
+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)
+
+ftgl_env.Append (CPPDEFINES = defines)
+ftgl_env.Append (CPPPATH = ['include',
+                             'src'])
+
+ftgl_env.Append (CPPPATH = user_options_dict['FREETYPE_INCLUDE'])
+
+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']
+
+ftgl_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_ftgl', source=source_files)
diff --git a/extern/qhull/SConscript b/extern/qhull/SConscript
index 5c87b8d3452..927ca3a6a0d 100644
--- a/extern/qhull/SConscript
+++ b/extern/qhull/SConscript
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 import sys
+import os
 
-qhull_env = Environment()
+qhull_env = Environment(ENV = os.environ)
 
 # Import the C flags set in the SConstruct file
 Import ('cflags')
diff --git a/extern/solid/SConscript b/extern/solid/SConscript
index 12996b6a7ff..00402d640e8 100644
--- a/extern/solid/SConscript
+++ b/extern/solid/SConscript
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 import sys
-solid_env = Environment()
+import os
+
+solid_env = Environment(ENV = os.environ)
 
 # Import the C flags set in the SConstruct file
 Import ('cflags')