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/blenlib | |
parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/SConscript | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 0a2c3c0ebca..76b1c522b64 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -31,10 +31,17 @@ sources = env.Glob('intern/*.c') cflags='' # don't add ../blenkernel back! -incs = '. ../makesdna #/intern/guardedalloc #/intern/ghost #/extern/wcwidth' +incs = [ + '.', + '#/extern/wcwidth', + '#/intern/ghost', + '#/intern/guardedalloc', + '../makesdna', + env['BF_FREETYPE_INC'], + env['BF_ZLIB_INC'], + ] +incs = ' '.join(incs) -incs += ' ' + env['BF_FREETYPE_INC'] -incs += ' ' + env['BF_ZLIB_INC'] defs = [] if env['WITH_BF_BINRELOC']: |