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/blenloader | |
parent | 53fd499d28077144ddb97237aced8b26ca5744cc (diff) |
code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/SConscript | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript index 778cbef2a8b..30cbc79a40d 100644 --- a/source/blender/blenloader/SConscript +++ b/source/blender/blenloader/SConscript @@ -29,14 +29,24 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. #/intern/guardedalloc ../blenfont ../blenlib ../blenkernel' -incs += ' ../makesdna ../editors/include' -incs += ' ../render/extern/include ../makesrna ../nodes ../bmesh ../imbuf' - -incs += ' ' + env['BF_ZLIB_INC'] +incs = [ + '.', + '#/intern/guardedalloc', + '../blenfont', + '../blenkernel', + '../blenlib', + '../bmesh', + '../editors/include', + '../imbuf', + '../makesdna', + '../makesrna', + '../nodes', + '../render/extern/include', + env['BF_ZLIB_INC'], + ] if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs.append(env['BF_PTHREADS_INC']) defs = [] @@ -44,6 +54,6 @@ if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): - env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [167,30]) #, cc_compileflags=['/WX'] ) + env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player'], priority = [167, 30]) #, cc_compileflags=['/WX']) else: - env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player','player2'], priority = [167,30,5] ) + env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player', 'player2'], priority=[167, 30, 5]) |