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/gpu | |
| parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) | |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/SConscript | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index 6e3722e403a..be3d3f5a927 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -32,13 +32,26 @@ sources += env.Glob('shaders/*.c') defs = [ 'GLEW_STATIC' ] -incs = '../blenlib ../blenkernel ../makesdna ../makesrna ../include ../blenloader ../nodes ../nodes/intern' -incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf ../bmesh .' +incs = [ + '.', + '#/intern/guardedalloc', + '#/intern/smoke/extern', + '#/extern/glew/include', + '../blenkernel', + '../blenlib', + '../blenloader', + '../bmesh', + '../imbuf', + '../include', + '../makesdna', + '../makesrna', + '../nodes', + '../nodes/intern', + env['BF_OPENGL_INC'], + ] if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): - incs += ' ' + env['BF_PTHREADS_INC'] - -incs += ' ' + env['BF_OPENGL_INC'] + incs.append(env['BF_PTHREADS_INC']) if env['WITH_BF_SMOKE']: defs.append('WITH_SMOKE') @@ -59,4 +72,4 @@ sources.extend(( os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_vert.glsl.c"), )) -env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] ) +env.BlenderLib('bf_gpu', sources, incs, defines=defs, libtype=['core', 'player'], priority=[160, 110]) |