diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 06:14:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 06:14:39 +0400 |
commit | 936b82802a6fb987876518a48c4e7602cc5d7634 (patch) | |
tree | e34884eb606d6e489ef21ce95c55281913ebc9c6 /source/blender/modifiers/SConscript | |
parent | dccec5727ef8325bb16e1125236ccceab36bd878 (diff) |
add bullet define & include for scons makesrna, also move meshcache utils into own file.
Diffstat (limited to 'source/blender/modifiers/SConscript')
-rw-r--r-- | source/blender/modifiers/SConscript | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index d3430c6a4d5..cbd0ad12e05 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -29,13 +29,26 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. ./intern' -incs += ' #/intern/guardedalloc #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include #/intern/opennl/extern' -incs += ' ../render/extern/include ../blenloader ../bmesh' -incs += ' ../include ../blenlib ../blenfont ../makesdna ../makesrna ../blenkernel ../blenkernel/intern' -incs += ' ../gpu' - -incs += ' ' + env['BF_ZLIB_INC'] +incs = [ + '.', + './intern', + '#/intern/guardedalloc', + '#/intern/bsp/extern', + '#/intern/elbeem/extern', + '#/extern/glew/include', + '#/intern/opennl/extern', + '../render/extern/include', + '../blenloader', + '../bmesh', + '../include', + '../blenlib', + '../blenfont', + '../makesdna', + '../makesrna', + '../blenkernel', + '../gpu', + env['BF_ZLIB_INC'], + ] defs = [] @@ -43,7 +56,7 @@ if env ['WITH_BF_BOOLEAN']: defs.append('WITH_MOD_BOOLEAN') if env['WITH_BF_REMESH']: - incs += ' #/intern/dualcon' + incs.append('#/intern/dualcon') defs.append('WITH_MOD_REMESH') if env['WITH_BF_FLUID']: @@ -53,12 +66,12 @@ if env['WITH_BF_OCEANSIM']: defs.append('WITH_OCEANSIM') if env['WITH_BF_GAMEENGINE']: - incs += ' #/extern/recastnavigation' + incs.append('#/extern/recastnavigation') defs.append('WITH_GAMEENGINE') if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') -env.BlenderLib ( libname = 'bf_modifiers', sources = sources, - includes = Split(incs), defines=defs, - libtype=['core','player'], priority = [80, 40] ) +env.BlenderLib(libname='bf_modifiers', sources=sources, + includes=incs, defines=defs, + libtype=['core', 'player'], priority=[80, 40]) |