enable truetype fonts for text objects when building with the original

Makefiles. Platform manages should check nan_definitions.mk and set
INTERNATIONAL to true for their platforms.

source/blender/blenkernel/intern/Makefile

@@ -58,8 +58,6 @@ CPPFLAGS += -I../../bpython/include
 CPPFLAGS += -I../../avi
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
-CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
-
 # we still refer to /include a bit...
 CPPFLAGS += -I../../include
 
@@ -74,3 +72,8 @@ CPPFLAGS += -I$(NAN_IKSOLVER)/include
 # path to our own external headerfiles
 CPPFLAGS += -I..
 
+ifdef WITH_FREETYPE2
+    CPPFLAGS += -DWITH_FREETYPE2
+    CPPFLAGS += -I$(NAN_FREETYPE)/include
+    CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
+endif

source/blender/blenlib/BLI_vfontdata.h

@@ -63,7 +63,6 @@ typedef struct VFontData {
 BLI_vfontdata_from_psfont(
 	struct PackedFile *pf);
 
-#ifdef WITH_FREETYPE2
 /**
  * Construct a new VFontData structure from 
  * Freetype font data in a PackedFile.
@@ -77,5 +76,3 @@ BLI_vfontdata_from_freetypefont(
 	struct PackedFile *pf);
 #endif
 
-#endif
-

source/blender/blenlib/intern/Makefile

@@ -49,5 +49,10 @@ CPPFLAGS += -I..
 # path to the guarded memory allocator
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 # path to freetype font stuff
+CPPFLAGS += -I$(NAN_FREETYPE)/include
 CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
 CPPFLAGS += -I../../include/
+
+ifdef WITH_FREETYPE2
+	CPPFLAGS += -DWITH_FREETYPE2
+endif