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, 0 insertions, 16 deletions

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index b22e7b1dd70..334c8e6906b 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -40,10 +40,6 @@ SET(INC
 )
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-IF(WITH_INTERNATIONAL)
-  ADD_DEFINITIONS(-DWITH_FREETYPE2)
-ENDIF(WITH_INTERNATIONAL)
-
 IF(WIN32)
   SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index d0084be0d56..e0411a6fc80 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -12,9 +12,6 @@ defs = ''
 if env['WITH_BF_SDL']:
 	incs += ' ' + env['BF_SDL_INC']
 
-if env['WITH_BF_INTERNATIONAL']:
-    defs = 'WITH_FREETYPE2'
-
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
     incs += ' ../../../extern/binreloc/include'
diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile
index f92fa0a7e25..f729a4e3fe0 100644
--- a/source/blender/blenlib/intern/Makefile
+++ b/source/blender/blenlib/intern/Makefile
@@ -53,9 +53,6 @@ CPPFLAGS += -I$(NAN_ZLIB)/include
 ifdef NAN_PTHREADS
   CPPFLAGS += -I$(NAN_PTHREADS)/include
 endif
-ifeq ($(WITH_FREETYPE2), true)
-	CPPFLAGS += -DWITH_FREETYPE2
-endif
 ifeq ($(OS),linux)
 	CPPFLAGS += -I$(OCGDIR)/extern/binreloc/include
 endif
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index 4b7b5914b60..0f2a6179964 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -30,8 +30,6 @@
  * Code that uses exotic character maps is present but commented out.
  */
 
-#ifdef WITH_FREETYPE2
-
 #ifdef WIN32
 #pragma warning (disable:4244)
 #endif
@@ -514,10 +512,6 @@ int BLI_vfontchar_from_freetypefont(VFont *vfont, unsigned long character)
 	return TRUE;
 }
 
-#endif // WITH_FREETYPE2
-
-
-
 #if 0
 
 // Freetype2 Outline struct