diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-20 22:42:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-20 22:42:28 +0400 |
| commit | 6de829cb7a2b78657d3aa1d1ced04ac98cd8ebac (patch) | |
| tree | 91c524684eb53230bbdc8b139558458fe390b41d /source/blender/blenfont | |
| parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) | |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/SConscript | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 3529330a308..e2ff41e9b9c 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -30,10 +30,23 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. intern #/intern/guardedalloc #/intern/locale ../blenkernel ../blenlib ../blenloader' -incs += ' ../makesdna ../makesrna ../python ../imbuf ../editors/include' -incs += ' #/extern/glew/include' -incs += ' ' + env['BF_FREETYPE_INC'] +incs = [ + '.', + 'intern', + '#/intern/guardedalloc', + '#/intern/locale', + '#/extern/glew/include', + '../blenkernel', + '../blenlib', + '../blenloader', + '../editors/include', + '../imbuf', + '../makesdna', + '../makesrna', + '../python', + ] + +incs.extend(Split(env['BF_FREETYPE_INC'])) defs = ['GLEW_STATIC'] @@ -43,4 +56,4 @@ if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross': if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') -env.BlenderLib ( 'bf_blenfont', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[210,210] ) +env.BlenderLib('bf_blenfont', sources, incs, defines=defs, libtype=['core', 'player'], priority=[210, 210]) |