Moving Language code from interface/text.c to blenfont library.

I go to start commit the new code here and then replace one
by one bmfont and ftfont, this do nothing right now, but it's
more easy keep the files here to work from the studio and my home.

I only update the Makefile and SConscript (but JesterKing a double
check never is bad), so please check the msvc and cmake files.

The new library is libblenfont.a

4 files changed, 6 insertions, 8 deletions

diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript
index a160d13a64f..862235d7b4b 100644
--- a/source/blender/windowmanager/SConscript
+++ b/source/blender/windowmanager/SConscript
@@ -9,7 +9,7 @@ sources = env.Glob('intern/*.c')
 incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
 incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
 incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system'
-incs += ' ../makesrna ../gpu'
+incs += ' ../makesrna ../gpu ../blenfont'
 
 incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont'
 incs += ' #/intern/elbeem #/extern/glew/include'
diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile
index b5b04b11be7..0bf161e3250 100644
--- a/source/blender/windowmanager/intern/Makefile
+++ b/source/blender/windowmanager/intern/Makefile
@@ -62,6 +62,7 @@ CPPFLAGS += -I../../render/extern/include
 CPPFLAGS += -I../../ftfont
 CPPFLAGS += -I../../radiosity/extern/include
 CPPFLAGS += -I../../../kernel/gen_system
+CPPFLAGS += -I../../blenfont
 
 # path to the guarded memory allocator
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index d013ab4228d..86e0bc6474c 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -81,6 +81,7 @@
 #include "GHOST_C-api.h"
 
 #include "UI_interface.h"
+#include "BLF_api.h"
 
 // XXX #include "BPY_extern.h"
 
@@ -583,9 +584,7 @@ int WM_read_homefile(bContext *C, int from_memory)
 	G.fileflags &= ~G_FILE_AUTOPLAY;	/*  disable autoplay in .B.blend... */
 //	mainwindow_set_filename_to_title("");	// empty string re-initializes title to "Blender"
 
-#ifdef INTERNATIONAL
-// XXX	read_languagefile();
-#endif
+	BLF_lang_init();
 	
 //	refresh_interface_font();
 	
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 65acef765b0..654555f65e9 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -89,6 +89,7 @@
 #include "ED_util.h"
 
 #include "UI_interface.h"
+#include "BLF_api.h"
 
 #include "GPU_extensions.h"
 #include "GPU_draw.h"
@@ -223,10 +224,7 @@ void WM_exit(bContext *C)
 	
 //	fsmenu_free();
 	
-#ifdef INTERNATIONAL
-//	free_languagemenu();
-#endif
-	
+	BLF_lang_exit();
 	RE_FreeAllRender();
 	
 //	free_txt_data();