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)

4 files changed, 4 insertions, 11 deletions

diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index e090a4b9c56..107ef9b4b87 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -7,7 +7,6 @@ SET(INC
   ../../../intern/string
   ../../../intern/guardedalloc
   ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-  ../../../intern/bmfont
   ../../../source/gameengine/Converter
   ../../../source/blender/imbuf
   ../../../intern/ghost/include
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
index 648ad79210e..b08eaf6e026 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
@@ -42,8 +42,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "BMF_Api.h"
-
 #include "GL/glew.h"
 
 #include "BL_Material.h" // MAXTEX
@@ -148,8 +146,7 @@ void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height
 
 	/* the actual drawing */
 	glColor3ub(255, 255, 255);
-	glRasterPos2s(xco, height-yco);
-	BMF_DrawString(G.fonts, text);
+	BLF_draw_default(xco, height-yco, 0.0f, text);
 
 	glMatrixMode(GL_TEXTURE);
 	glPopMatrix();
@@ -184,11 +181,9 @@ void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int
 
 	/* draw in black first*/
 	glColor3ub(0, 0, 0);
-	glRasterPos2s(xco+1, height-yco-1);
-	BMF_DrawString(G.fonts, text);
+	BLF_draw_default(xco+1, height-yco-1, 0.0f, text);
 	glColor3ub(255, 255, 255);
-	glRasterPos2s(xco, height-yco);
-	BMF_DrawString(G.fonts, text);
+	BLF_draw_default(xco, height-yco, 0.0f, text);
 
 	glMatrixMode(GL_TEXTURE);
 	glPopMatrix();
diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile
index 03a7a247727..3a2c30672cc 100644
--- a/source/gameengine/BlenderRoutines/Makefile
+++ b/source/gameengine/BlenderRoutines/Makefile
@@ -40,7 +40,6 @@ CPPFLAGS += -I$(NAN_SUMO)/include -I$(NAN_SOLID)/include
 CPPFLAGS += -I$(NAN_SOLID)
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
-CPPFLAGS += -I$(NAN_BMFONT)/include
 CPPFLAGS += -I$(NAN_FUZZICS)/include
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
 CPPFLAGS += -I$(NAN_GLEW)/include
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 020402e9bcd..684b80dceee 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
 defs = []
 
 incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
-incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
+incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer'
 incs += ' #source/gameengine/Converter #source/blender/imbuf'
 incs += ' #intern/ghost/include'
 incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib'