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/windowmanager/SConscript | |
parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/windowmanager/SConscript')
-rw-r--r-- | source/blender/windowmanager/SConscript | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 6db0e142ac4..62c00c0897d 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -30,19 +30,32 @@ import os sources = env.Glob('intern/*.c') -#incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel' -#incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include' - -incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel' -incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' -incs += ' ../radiosity/extern/include' -incs += ' ../makesrna ../gpu ../blenfont ../bmesh ../compositor' - -incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' -incs += ' #/intern/elbeem #/extern/glew/include' -incs += ' #source/gameengine/BlenderRoutines' - -incs += ' ' + env['BF_ZLIB_INC'] +incs = [ + '.', + '#/intern/elbeem', + '#/intern/ghost', + '#/intern/guardedalloc', + '#/intern/memutil', + '#/source/gameengine/BlenderRoutines', + '#/extern/glew/include', + '../blenfont', + '../blenkernel', + '../blenlib', + '../blenloader', + '../bmesh', + '../compositor', + '../editors/include', + '../gpu', + '../imbuf', + '../makesdna', + '../makesrna', + '../nodes', + '../python', + '../radiosity/extern/include', + '../render/extern/include', + env['BF_ZLIB_INC'], + ] +incs = ' '.join(incs) defs = [ 'GLEW_STATIC' ] |