diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
| commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
| tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /source/blender/blenfont/SConscript | |
| parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/blenfont/SConscript')
| -rw-r--r-- | source/blender/blenfont/SConscript | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 61d2ca9b12d..6c3b5748011 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -34,11 +34,11 @@ incs = [ '.', 'intern', '#/intern/guardedalloc', - '#/intern/locale', env['BF_GLEW_INC'], '#/intern/glew-mx', '../blenkernel', '../blenlib', + '../blentranslation', '../editors/include', '../gpu', '../imbuf', @@ -48,7 +48,8 @@ incs = [ incs.extend(Split(env['BF_FREETYPE_INC'])) -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross': defs.append('_WIN32') |