[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18738] branches/blender2.5/blender/source /blender/blenfont: 'scons blenderlite' failed because blf expected freetype

[Campbell Barton]

Revision: 18738
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18738
Author:   campbellbarton
Date:     2009-01-29 22:41:43 +0100 (Thu, 29 Jan 2009)

Log Message:
-----------
'scons blenderlite' failed because blf expected freetype

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenfont/SConscript
    branches/blender2.5/blender/source/blender/blenfont/intern/blf_lang.c

Modified: branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt	2009-01-29 18:54:22 UTC (rev 18737)
+++ branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt	2009-01-29 21:41:43 UTC (rev 18738)
@@ -31,4 +31,8 @@
   ../blenkernel ../ftfont
 )
 
+IF(WITH_INTERNATIONAL)
+  ADD_DEFINITIONS(-DWITH_FREETYPE2)
+ENDIF(WITH_INTERNATIONAL)
+
 BLENDERLIB(bf_blenfont "${SRC}" "${INC}")
\ No newline at end of file

Modified: branches/blender2.5/blender/source/blender/blenfont/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/SConscript	2009-01-29 18:54:22 UTC (rev 18737)
+++ branches/blender2.5/blender/source/blender/blenfont/SConscript	2009-01-29 21:41:43 UTC (rev 18738)
@@ -8,4 +8,7 @@
 
 defs = ''
 
+if env['WITH_BF_INTERNATIONAL']:
+	defs += ' WITH_FREETYPE2'
+
 env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] )

Modified: branches/blender2.5/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/intern/blf_lang.c	2009-01-29 18:54:22 UTC (rev 18737)
+++ branches/blender2.5/blender/source/blender/blenfont/intern/blf_lang.c	2009-01-29 21:41:43 UTC (rev 18738)
@@ -42,7 +42,9 @@
 #include "blf_internal_types.h"
 
 // XXX 2.50 Remove this later.
+#ifdef WITH_FREETYPE2
 #include "FTF_Api.h"
+#endif
 
 static ListBase global_lang= { NULL, NULL };
 static int global_tot_lang= 0;
@@ -99,12 +101,14 @@
 
 void BLF_lang_set(int id)
 {
+#ifdef WITH_FREETYPE2
 	LangBLF *lme;
 
 	// XXX 2.50 Remove this later, with ftfont
 	lme= blf_lang_find_by_id(id);
 	if(lme) FTF_SetLanguage(lme->code);
 	else FTF_SetLanguage("en_US");
+#endif
 }
 
 static void blf_lang_split(char *line, LangBLF* lme)