diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-01-30 00:41:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-01-30 00:41:43 +0300 |
| commit | 63ad011e9767c291608084008235cee0cc422d43 (patch) | |
| tree | e456e0084ec25ccf0ab6fb35c0090416fb349b0f /source/blender/blenfont | |
| parent | 5f9ee2cbfe3770838482e7c8f37194f127e8a8c5 (diff) | |
'scons blenderlite' failed because blf expected freetype
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/blenfont/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf_lang.c | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index c74b0a533f0..cd91bf69c91 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -31,4 +31,8 @@ SET(INC ../blenkernel ../ftfont ) +IF(WITH_INTERNATIONAL) + ADD_DEFINITIONS(-DWITH_FREETYPE2) +ENDIF(WITH_INTERNATIONAL) + BLENDERLIB(bf_blenfont "${SRC}" "${INC}")
\ No newline at end of file diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index a21150661fa..009b96f90b1 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -8,4 +8,7 @@ incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ defs = '' +if env['WITH_BF_INTERNATIONAL']: + defs += ' WITH_FREETYPE2' + env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] ) diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index 527656f67b0..0aaf399cf58 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -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 @@ char *BLF_lang_find_code(short langid) 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) |