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)

1 files changed, 0 insertions, 35 deletions

diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index eadc334431d..ba2f8f04233 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -106,17 +106,14 @@ endif
     export NAN_ACTION ?= $(LCGDIR)/action
     export NAN_GHOST ?= $(LCGDIR)/ghost
     export NAN_TEST_VERBOSITY ?= 1
-    export NAN_BMFONT ?= $(LCGDIR)/bmfont
     export NAN_OPENNL ?= $(LCGDIR)/opennl
     export NAN_ELBEEM ?= $(LCGDIR)/elbeem
     export NAN_SUPERLU ?= $(LCGDIR)/superlu
     export NAN_GLEW ?= $(LCGDIR)/glew
     ifeq ($(FREE_WINDOWS), true)
-      export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
       export NAN_FFMPEG ?= $(LCGDIR)/gcc/ffmpeg
       export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libavdevice.a
     else
-      export NAN_FTGL ?= $(LCGDIR)/ftgl
       export NAN_FFMPEG ?= $(LCGDIR)/ffmpeg
       export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libswscale.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavdevice.a
     endif
@@ -172,9 +169,6 @@ endif
     # l10n
     #export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    #export WITH_FREETYPE2 ?= true
-
   else
   ifeq ($(OS),darwin)
 
@@ -246,9 +240,6 @@ endif
     # enable l10n
     export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    export WITH_FREETYPE2 ?= true
-
   else
   ifeq ($(OS),freebsd)
 
@@ -290,9 +281,6 @@ endif
     # enable l10n
     # export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    # export WITH_FREETYPE2 ?= true
-
   else
   ifeq ($(OS),irix)
 
@@ -347,9 +335,6 @@ endif
     # enable l10n
     export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    export WITH_FREETYPE2 ?= true
-
   else
   ifeq ($(OS),linux)
 
@@ -403,9 +388,6 @@ endif
     # l10n
     export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    export WITH_FREETYPE2 ?= true
-
     export WITH_BINRELOC ?= true
 
     # enable ffmpeg support
@@ -454,9 +436,6 @@ endif
     # l10n
     #export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    #export WITH_FREETYPE2 ?= true
-
   else
   ifeq ($(OS),solaris)
 
@@ -502,9 +481,6 @@ endif
     # l10n
     #export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    #export WITH_FREETYPE2 ?= true
-
   else
   ifeq ($(OS),windows)
 
@@ -561,9 +537,6 @@ endif
     # l10n
     export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    export WITH_FREETYPE2 ?= true
-
     # enable quicktime support
     # export WITH_QUICKTIME ?= true
 
@@ -605,9 +578,6 @@ endif
     # l10n
     #export INTERNATIONAL ?= true
 
-    # enable freetype2 support for text objects
-    #export WITH_FREETYPE2 ?= true
-
   endif # windows + fallback
   endif # solaris
   endif # openbsd
@@ -624,8 +594,3 @@ ifeq ($(NAN_NO_KETSJI), true)
    export NAN_JUST_BLENDERDYNAMIC=true
    export NAN_NO_OPENAL=true
 endif
-
-# INTERNATIONAL implies WITH_FREETYPE2
-ifeq ($(INTERNATIONAL), true)
-   export WITH_FREETYPE2=true
-endif