diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-09-24 11:03:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-24 11:03:18 +0400 |
| commit | b94ed5d7e469c6c3ea421919138da8c04a3f01e3 (patch) | |
| tree | f431fba46204e332d5627c65ab8c25e5cbe9ce33 /source/blender/blenfont/SConscript | |
| parent | 20998fdcfa6e7dd74adc0f38af6135fdddbefdc0 (diff) | |
- cmake/make/scons didnt define INTERNATIONAL when buidling blenfont
- BLF_lang_init used confusing IFDEF's, unlikely this was well tested. Split this into 3 functions for Apple/Win32/Unix, Unix uses BLI_gethome_folder(), cant test others, ideally they should use BLI_gethome_folder too but needs testing.
Possibly each os cant be made to use BLI_gethome_folder and the separate func's can be removed (please test).
- units, hectometers were displayed wrong.
Diffstat (limited to 'source/blender/blenfont/SConscript')
| -rw-r--r-- | source/blender/blenfont/SConscript | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index d070d985247..91edc46ba8b 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -9,9 +9,13 @@ incs += ' #/extern/glew/include' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_GETTEXT_INC'] -defs = '' +defs = [] if sys.platform == 'win32': - defs += ' _WIN32 USE_GETTEXT_DLL' + defs.append('_WIN32') + defs.append('USE_GETTEXT_DLL') + +if env['WITH_BF_INTERNATIONAL']: + defs.append('INTERNATIONAL') env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core','player'], priority=[210,210] ) |