Big, big commit!!

1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
   the old BMF api.

I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.

MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
        Always have to link/include the freetype2 library
        Remove any reference to libbmfont
        Remove any reference to libftfont
        Remove any reference to libbftgl (or libbFTGL)

5 files changed, 0 insertions, 1165 deletions

diff --git a/extern/bFTGL/win32_vcpp/README_WIN32.txt b/extern/bFTGL/win32_vcpp/README_WIN32.txt
deleted file mode 100644
index bc92bbb9591..00000000000
--- a/extern/bFTGL/win32_vcpp/README_WIN32.txt
+++ /dev/null
@@ -1,206 +0,0 @@
-FTGL 1.31
-
-NOTES FOR COMPILING ON WINDOWS 
-
-14 Feb 2002
-
-Ellers, ellers@iinet.net.au
-
-
-
-
-
-SUPPORTED COMPILERS
-
-
-
-I have rebuilt the FTGL project files for Visual C++ (version 6). There are
-
-presently no other compilers or environments supported but feel free to
-
-contribute them. 
-
-
-
-
-
-QUICK GUIDE: COMPILING FTGL
-
-
-
- - Start up MSVC++ with ftgl.dsw. 
-
- - Tell MSVC++ where FreeType is. You'll need to do something like this:
-
- 
-
-     *  select Project>Settings
-
-     *  select ftgl_static (for a start)
-
-     *  select "All Configurations"
-
-     *  go to the tab C++ > PreProcessor
-
-     *  Set additional include directories appropriately. For me it is:
-
-        D:\cots\freetype-2.0.5\include
-
-     *  repeat for all configurations of ftgl_dll
-
-
-
-
-
-QUICK GUIDE: COMPILING/RUNNING SUPPLIED DEMO PROGRAM 
-
-
-
- - The program expects the first argument to be the name of a truetype file.
-
-   I copied timesbi.ttf from the windows directory to C:\TEMP and then edit
-
-   the settings of the project:
-
-   
-
-    * select Project>Settings
-
-    * select Demo project
-
-    * select panel Debug>General
-
-    * set Program Arguments to be "C:\TEMP\timesbi.ttf"
-
-
-
-
-
-QUICK GUIDE: COMPILING YOUR PROGRAM TO USE FTGL
-
-
-
- - Choose dynamic or static library linkage
-
-     *  if you want to link to a static FTGL library ensure that 
-
-        FTGL_LIBRARY_STATIC is defined in the preprocessor section
-
-     
-
-
-
-CONFIGURATION / CODE GENERATION / C LIBRARIES
-
-
-
-FTGL can be built in various configurations (inspired by Freetype and libpng):
-
-
-
- - static library (.lib)
-
- - dynamic library (.dll)
-
- 
-
-MSVC++ requires selection of "code generation" option, which seems to be 
-
-mostly to do with which version of the Standard C library is linked with the
-
-library. 
-
-
-
-The following modes are supported:
-
-
-
- - static/dynamic
-
- - single threaded (ST) or multithreaded (MT)
-
-   NOTE: the multithreaded DLL (MD) mode was NOT included, as freetype itself
-
-         doesn't support that mode so I figure there's no point yet.
-
- - debug/release (debug has _d suffix)
-
- 
-
-So the static multithreaded release library is:
-
-
-
-	ftgl_static_MT.lib
-
-	
-
-The same library built in DEBUG mode:
-
-
-
-	ftgl_static_MT_d.lib
-
-
-
-If you're not sure which one is appropriate (and if you're a novice don't
-
-been too put off...) start with making the decision about debug or release.
-
-This should be easy because if you're building the debug version of your 
-
-app its probably a good idea to link with the debug version of FTGL (but
-
-not compulsory). Once thats done, you may get errors like:
-
-
-
-	LIBCMTD.lib(crt0init.obj) : warning LNK4098: defaultlib "libcmt.lib" conflicts with use of other libs; use /NODEFAULTLIB:library
-
- 
-
-This will happen, for example, when you link a glut app with an FTGL library
-
-compiled with different codegen options than the GLUT library. 
-
-
-
-MSVC++ "sort of" 
-
-requires that all libs be linked with the same codegen option. GLUT is built
-
-in XXX mode, so if you're linking with GLUT, you can get rid of the warning
-
-by linking with the XXX version of FTGL. The various versions are particularly
-
-useful if you're doing std C stuff, like printf etc. 
-
-
-
-
-
-
-
-FAQ
-
-
-
-Q: "But... do I HAVE to use all these DIFFERENT build modes, like multi-
-
-   threaded, debug single threaded, etc?"
-
-   
-
-A: No. Sometimes library makers only generate one style anyway. It depends
-
-   on your needs. Unless you're linking with standard C stuff (e.g. printf)
-
-   then it probably won't make a great deal of difference. If you get 
-
-   warnings about "default lib libcmt.lib conflicts" etc, then you can make
-
-   use of the different libraries.
-
-
-
diff --git a/extern/bFTGL/win32_vcpp/ftgl.dsw b/extern/bFTGL/win32_vcpp/ftgl.dsw
deleted file mode 100644
index 17b8fbe6f12..00000000000
--- a/extern/bFTGL/win32_vcpp/ftgl.dsw
+++ /dev/null
@@ -1,92 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "ftgl_demo"=".\ftgl_demo\ftgl_demo.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ftgl_dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ftgl_static_lib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ftgl_demo_2"=".\ftgl_demo\ftgl_demo_2.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ftgl_dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ftgl_static_lib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ftgl_dll"=".\ftgl_dll\ftgl_dll.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ftgl_static_lib"=".\ftgl_static_lib\ftgl_static_lib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "unit_tests"=".\unit_tests\unit_tests.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ftgl_static_lib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp b/extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp
deleted file mode 100644
index 7e297df9111..00000000000
--- a/extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp
+++ /dev/null
@@ -1,357 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ftgl_dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ftgl_dll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ftgl_dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ftgl_dll.mak" CFG="ftgl_dll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ftgl_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ftgl_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ftgl_dll - Win32 Release MT" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ftgl_dll - Win32 Debug MT" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ftgl_dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_ST"
-# PROP BASE Intermediate_Dir "Release_ST"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../Build"
-# PROP Intermediate_Dir "Release_ST"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "../Build"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204.lib /nologo /dll /machine:I386 /out:"../Build/ftgl_dynamic_MT.dll" /libpath:"D:\cots\freetype-2.0.5\objs"
-
-!ELSEIF  "$(CFG)" == "ftgl_dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_ST"
-# PROP BASE Intermediate_Dir "Debug_ST"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../Build"
-# PROP Intermediate_Dir "Debug_ST"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "../Build"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204_D.lib /nologo /dll /pdb:"Debug_ST/ftgl_dynamic_ST_d.pdb" /debug /machine:I386 /out:"../Build/ftgl_dynamic_MT_d.dll" /pdbtype:sept /libpath:"D:\cots\freetype-2.0.5\objs"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "ftgl_dll - Win32 Release MT"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_MT"
-# PROP BASE Intermediate_Dir "Release_MT"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../Build"
-# PROP Intermediate_Dir "Release_MT"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "../Build"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204MT.lib /nologo /dll /machine:I386 /out:"../Build/ftgl_dynamic_MTD.dll" /libpath:"D:\cots\freetype-2.0.5\objs"
-
-!ELSEIF  "$(CFG)" == "ftgl_dll - Win32 Debug MT"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_MT"
-# PROP BASE Intermediate_Dir "Debug_MT"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../Build"
-# PROP Intermediate_Dir "Debug_MT"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "../Build"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_DLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTGL_LIBRARY" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib freetype204MT_D.lib /nologo /dll /pdb:"Debug_ST/ftgl_dynamic_MT_d.pdb" /debug /machine:I386 /out:"../Build/ftgl_dynamic_MTD_d.dll" /pdbtype:sept /libpath:"D:\cots\freetype-2.0.5\objs"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ftgl_dll - Win32 Release"
-# Name "ftgl_dll - Win32 Debug"
-# Name "ftgl_dll - Win32 Release MT"
-# Name "ftgl_dll - Win32 Debug MT"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\FTBitmapGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTCharmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTContour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTExtrdGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTFace.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLBitmapFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLExtrdFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLOutlineFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLPixmapFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLPolygonFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLTextureFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGlyphContainer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTLibrary.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTOutlineGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTPixmapGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTPoint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTPolyGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTSize.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTTextureGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTVectoriser.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\FTBBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTBitmapGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTCharmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTCharToGlyphIndexMap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTContour.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTExtrdGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTFace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGL.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLBitmapFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLExtrdFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLOutlineFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLPixmapFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLPolygonFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLTextureFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGlyphContainer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTLibrary.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTList.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTOutlineGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTPixmapGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTPoint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTPolyGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTSize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTTextureGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTVector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTVectoriser.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp b/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp
deleted file mode 100644
index bc2c77cb0b6..00000000000
--- a/extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp
+++ /dev/null
@@ -1,342 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ftgl_static_lib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ftgl_static_lib - Win32 Debug MT
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ftgl_static_lib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ftgl_static_lib.mak" CFG="ftgl_static_lib - Win32 Debug MT"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ftgl_static_lib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ftgl_static_lib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ftgl_static_lib - Win32 Debug MT" (based on "Win32 (x86) Static Library")
-!MESSAGE "ftgl_static_lib - Win32 Release MT" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ftgl_static_lib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_ST"
-# PROP BASE Intermediate_Dir "Release_ST"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_ST"
-# PROP Intermediate_Dir "Release_ST"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\lib\windows\freetype\include" /I "..\..\include" /I "..\..\..\..\..\lib\windows\freetype\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\Build\ftgl_static_ST.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=ECHO Copying lib to lib\windows\ftgl\lib	XCOPY /Y ..\Build\*lib ..\..\..\..\..\lib\windows\ftgl\lib
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "ftgl_static_lib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_ST"
-# PROP BASE Intermediate_Dir "Debug_ST"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_ST"
-# PROP Intermediate_Dir "Debug_ST"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\Build\ftgl_static_MT_d.lib"
-
-!ELSEIF  "$(CFG)" == "ftgl_static_lib - Win32 Debug MT"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_MT"
-# PROP BASE Intermediate_Dir "Debug_MT"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_MT"
-# PROP Intermediate_Dir "Debug_MT"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\Build\ftgl_static_MTD_d.lib"
-
-!ELSEIF  "$(CFG)" == "ftgl_static_lib - Win32 Release MT"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_MT"
-# PROP BASE Intermediate_Dir "Release_MT"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_MT"
-# PROP Intermediate_Dir "Release_MT"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "D:\cots\freetype-2.0.5\include" /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FTGL_LIBRARY_STATIC" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\Build\ftgl_static_MTD.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ftgl_static_lib - Win32 Release"
-# Name "ftgl_static_lib - Win32 Debug"
-# Name "ftgl_static_lib - Win32 Debug MT"
-# Name "ftgl_static_lib - Win32 Release MT"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\FTBitmapGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTCharmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTContour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTExtrdGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTFace.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLBitmapFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLExtrdFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLOutlineFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLPixmapFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLPolygonFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGLTextureFont.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTGlyphContainer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTLibrary.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTOutlineGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTPixmapGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTPoint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTPolyGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTSize.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTTextureGlyph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\FTVectoriser.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\FTBBox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTBitmapGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTCharmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTCharToGlyphIndexMap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTContour.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTExtrdGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTFace.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGL.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLBitmapFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLExtrdFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLOutlineFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLPixmapFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLPolygonFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGLTextureFont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTGlyphContainer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTLibrary.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTList.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTOutlineGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTPixmapGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTPoint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTPolyGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTSize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTTextureGlyph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTVector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\FTVectoriser.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp b/extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp
deleted file mode 100644
index f68dfe9b2d8..00000000000
--- a/extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp
+++ /dev/null
@@ -1,168 +0,0 @@
-# Microsoft Developer Studio Project File - Name="unit_tests" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=unit_tests - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "unit_tests.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "unit_tests.mak" CFG="unit_tests - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "unit_tests - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "unit_tests - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "unit_tests - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "$(MIC_COTS_CPPUNIT_DIR)/include" /I "../../include" /I "../../extras" /I "D:\cots\freetype-2.0.5\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "FTGL_LIBRARY_STATIC" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 freetype204MT.lib ftgl_static_MT.lib cppunit.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Build" /libpath:"D:\cots\freetype-2.0.5\objs" /libpath:"D:\cots\cppunit-1.9.8\lib"
-
-!ELSEIF  "$(CFG)" == "unit_tests - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(MIC_COTS_CPPUNIT_DIR)/include" /I "../../include" /I "../../extras" /I "D:\cots\freetype-2.0.5\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "FTGL_LIBRARY_STATIC" /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 freetype204MT_D.lib ftgl_static_MT_d.lib cppunitd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Build" /libpath:"D:\cots\freetype-2.0.5\objs" /libpath:"D:\cots\cppunit-1.9.8\lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "unit_tests - Win32 Release"
-# Name "unit_tests - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\..\test\FTBBox-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTCharmap-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTContour-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTFace-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTFont-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTGlyphContainer-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTLibrary-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTList-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTMesh-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTPoint-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTSize-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTTesselation-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTVector-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\test\FTVectoriser-Test.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\test\HPGCalc_afm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\test\HPGCalc_pfb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\test\TestMain.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\test\Fontdefs.h
-# End Source File
-# End Group
-# End Target
-# End Project