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/editors/space_view3d/SConscript | |
| parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) | |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/editors/space_view3d/SConscript')
| -rw-r--r-- | source/blender/editors/space_view3d/SConscript | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index b775c5bba59..313711d4e91 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -30,17 +30,29 @@ Import ('env') sources = env.Glob('*.c') defs = [ 'GLEW_STATIC' ] -incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' -incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include ../../blenloader' -incs += ' ../../gpu ../../makesrna ../../blenfont ../../bmesh' -incs += ' #/intern/smoke/extern' -incs += ' #source/gameengine/BlenderRoutines' +incs = [ + '#/intern/guardedalloc', + '#/extern/glew/include', + '#/intern/smoke/extern', + '#/source/gameengine/BlenderRoutines', + '../include', + '../../blenfont', + '../../blenkernel', + '../../blenlib', + '../../blenloader', + '../../bmesh', + '../../gpu', + '../../imbuf', + '../../makesdna', + '../../makesrna', + '../../render/extern/include', + '../../windowmanager', + ] if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs.append(env['BF_PTHREADS_INC']) if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') @@ -48,4 +60,4 @@ if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_FREESTYLE']: defs.append('WITH_FREESTYLE') -env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), defines = defs, libtype=['core'], priority=[40] ) +env.BlenderLib ( 'bf_editors_space_view3d', sources, incs, defines = defs, libtype=['core'], priority=[40] ) |