diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
| commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
| tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/modifiers/SConscript | |
| parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
| parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) | |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/modifiers/SConscript')
| -rw-r--r-- | source/blender/modifiers/SConscript | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index 39e3c62c579..c4196222ec8 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -5,16 +5,28 @@ sources = env.Glob('intern/*.c') incs = '. ./intern' incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern' +<<<<<<< .working incs += ' ../render/extern/include ../bmesh' +======= +incs += ' ../render/extern/include ../blenloader' +>>>>>>> .merge-right.r35190 incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern' incs += ' ' + env['BF_ZLIB_INC'] defs = [] +# could be made optional +defs += ['WITH_MOD_BOOLEAN'] +defs += ['WITH_MOD_DECIMATE'] + if env['BF_NO_ELBEEM']: - defs.append('DISABLE_ELBEEM') + defs.append('DISABLE_ELBEEM') env.BlenderLib ( libname = 'bf_modifiers', sources = sources, includes = Split(incs), defines=defs, +<<<<<<< .working libtype=['core','player'], priority = [161, 20] ) +======= + libtype=['core','player'], priority = [80, 40] ) +>>>>>>> .merge-right.r35190 |