Making the things compiled!!

I change the #if 0 with #if WITH_FREETYPE2, also fix a lot of typos, etc.
This is the basic but now it draw text!!, I am using the "User Preference"
space to test the library, nobody is working on that and the option are
in the outliner now so...

TODO-next: using the 4x4 mat, string size, bounding box, aspect and rotate.

Notes: I update the Makefile, missing some include and other things so
maybe scons, cmake and msvc also need update ?

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index 5aacb2343bb..f8d5159bd9b 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -36,11 +36,11 @@ typedef struct DirBLF {
 	char *path;
 } DirBLF;
 
-#if 0
+#ifdef WITH_FREETYPE2
 
-typedef struct _GlyphCacheBLF {
-	struct _GlyphCacheBLF *next;
-	struct _GlyphCacheBLF *prev;
+typedef struct GlyphCacheBLF {
+	struct GlyphCacheBLF *next;
+	struct GlyphCacheBLF *prev;
 
 	/* font size. */
 	int size;
@@ -88,9 +88,9 @@ typedef struct _GlyphCacheBLF {
 	float descender;
 } GlyphCacheBLF;
 
-typedef struct _GlyphBLF {
-	struct _GlyphBLF *next;
-	struct _GlyphBLF *prev;
+typedef struct GlyphBLF {
+	struct GlyphBLF *next;
+	struct GlyphBLF *prev;
 
 	/* and the character, as UTF8 */
 	unsigned int c;
@@ -173,7 +173,7 @@ typedef struct FontBLF {
 	GlyphCacheBLF *glyph_cache;
 } FontBLF;
 
-#endif /* zero!! */
+#endif /* WITH_FREETYPE2 */
 
 typedef struct LangBLF {
 	struct LangBLF *next;