diff options
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/BLF_api.h | 4 | ||||
| -rw-r--r-- | source/blender/blenfont/SConscript | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index 1485f0881b2..2d40cf48814 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -29,6 +29,8 @@ #ifndef BLF_API_H #define BLF_API_H +struct rctf; + int BLF_init(void); void BLF_exit(void); @@ -41,7 +43,7 @@ void BLF_position(float x, float y, float z); void BLF_size(int size, int dpi); void BLF_draw(char *str); -void BLF_boundbox(char *str, rctf *box); +void BLF_boundbox(char *str, struct rctf *box); float BLF_width(char *str); float BLF_height(char *str); void BLF_rotation(float angle); diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 42ccfc8e2ed..85797c3c23b 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -12,11 +12,11 @@ incs += ' ' + env['BF_GETTEXT_INC'] defs = '' -if env['WITH_BF_INTERNATIONAL']: - defs += ' WITH_FREETYPE2' - -defs = 'FTGL_STATIC_LIBRARY' +defs += 'FTGL_STATIC_LIBRARY' if sys.platform == 'win32': defs += ' _WIN32 USE_GETTEXT_DLL' +if env['WITH_BF_INTERNATIONAL']: + defs += ' WITH_FREETYPE2' + env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] ) |