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/blenkernel/SConscript | |
| parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) | |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 60 |
1 files changed, 39 insertions, 21 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 41684e5e535..6d080fea031 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -35,27 +35,45 @@ sources.remove('intern' + os.sep + 'mask.c') sources_mask = env.Glob('intern/mask*.c') -incs = '. #/intern/guardedalloc #/intern/memutil' -incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager' -incs += ' ../render/extern/include ../makesrna' -incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' -incs += ' #/intern/iksolver/extern ../blenloader' -incs += ' #/extern/bullet2/src' -incs += ' #/intern/rigidbody' -incs += ' #/intern/opennl/extern #/intern/bsp/extern' -incs += ' ../gpu #/extern/glew/include' -incs += ' ../bmesh' -incs += ' #/intern/smoke/extern' -incs += ' #/intern/mikktspace' -incs += ' #/intern/audaspace/intern' -incs += ' #/intern/ffmpeg' -incs += ' #/intern/raskter' -incs += ' #/extern/libmv' - -incs += ' ' + env['BF_OPENGL_INC'] -incs += ' ' + env['BF_ZLIB_INC'] - -defs = [ 'GLEW_STATIC' ] +incs = [ + '.', + '#/extern/libmv', + '#/intern/ffmpeg', + '#/intern/guardedalloc', + '#/intern/memutil', + '#/intern/mikktspace', + '#/intern/raskter', + '#/intern/rigidbody', + '#/extern/bullet2/src', + '#/extern/glew/include', + '#/intern/audaspace/intern', + '#/intern/bsp/extern', + '#/intern/elbeem/extern', + '#/intern/iksolver/extern', + '#/intern/opennl/extern', + '#/intern/smoke/extern', + '../avi', + '../blenfont', + '../blenlib', + '../blenloader', + '../bmesh', + '../gpu', + '../ikplugin', + '../imbuf', + '../makesdna', + '../makesrna', + '../modifiers', + '../nodes', + '../render/extern/include', + '../windowmanager', + env['BF_OPENGL_INC'], + env['BF_ZLIB_INC'], + ] +incs = ' '.join(incs) + +defs = [ + 'GLEW_STATIC', + ] if env['WITH_BF_SMOKE']: defs.append('WITH_SMOKE') |