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/compositor/SConscript | |
| parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) | |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/compositor/SConscript')
| -rw-r--r-- | source/blender/compositor/SConscript | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/source/blender/compositor/SConscript b/source/blender/compositor/SConscript index 64169ac7403..df22d99f76d 100644 --- a/source/blender/compositor/SConscript +++ b/source/blender/compositor/SConscript @@ -30,14 +30,31 @@ defs = ['GLEW_STATIC'] sources = env.Glob('intern/*.cpp') + env.Glob('nodes/*.cpp') + env.Glob('operations/*.cpp') -incs = '. nodes intern operations ../blenlib ../blenkernel ../makesdna ../render/extern/include ../render/intern/include' -incs += ' ../makesrna ../blenloader ../../../intern/guardedalloc ../imbuf ../windowmanager ' -incs += '#intern/opencl ../nodes ../nodes/intern ../nodes/composite ' +incs = [ + '.', + 'intern', + 'nodes', + 'operations', + '#/intern/opencl', + '../blenkernel', + '../blenlib', + '../blenloader', + '../imbuf', + '../makesdna', + '../makesrna', + '../nodes', + '../nodes/composite', + '../nodes/intern', + '../render/extern/include', + '../render/intern/include', + '../windowmanager', + '../../../intern/guardedalloc', -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs += ' ' + env['BF_PTHREADS_INC'] + # data files + env['DATA_HEADERS'], + ] -# data files -incs += ' ' + env['DATA_HEADERS'] +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs.append(env['BF_PTHREADS_INC']) -env.BlenderLib ( 'bf_composite', sources, Split(incs), defines=defs, libtype=['core'], priority = [164] ) +env.BlenderLib('bf_composite', sources, incs, defines=defs, libtype=['core'], priority=[164]) |