blender-archive/source/blender/modifiers/SConscript

#!/usr/bin/python
Import ('env')

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')

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
[#14437] Modifier Stack Refactor patch by Ben Batt (artificer) Updated patch for 6 or so modifiers added since the patch was written. - tested with CMake and SCons - fixed one error were flags were being added to the fluids type. - remove BKE_simple_deform.h, simple_deform.c, move functions into MOD_simpledeform.c since there were problems with circular deps. - moved some fluid and boolean functions used by modifiers too. 2010-04-11 22:12:30 +00:00			`#!/usr/bin/python`
			`Import ('env')`

			`sources = env.Glob('intern/*.c')`

			`incs = '. ./intern'`
			`incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern'`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`<<<<<<< .working`
updated another sconscript 2010-07-22 03:23:44 +00:00			`incs += ' ../render/extern/include ../bmesh'`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`=======`
I swear, it was just an innocence change in guardedalloc! The butterfly wing flap, causing a nice storm in the rest of blender. Now all dependencies should point ok again. CMakers, do double-test. 2011-02-21 12:35:04 +00:00			`incs += ' ../render/extern/include ../blenloader'`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`>>>>>>> .merge-right.r35190`
[#14437] Modifier Stack Refactor patch by Ben Batt (artificer) Updated patch for 6 or so modifiers added since the patch was written. - tested with CMake and SCons - fixed one error were flags were being added to the fluids type. - remove BKE_simple_deform.h, simple_deform.c, move functions into MOD_simpledeform.c since there were problems with circular deps. - moved some fluid and boolean functions used by modifiers too. 2010-04-11 22:12:30 +00:00			`incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern'`

			`incs += ' ' + env['BF_ZLIB_INC']`

Merge various small changes from render branch: * Division by zero fix for TNT SVD code. * Sound fix, in case ffmpeg decode fails, don't use the samples. * Fix for incorrect bounds of transformed objects in new raytracing code. * Gave memory arena's a name used for allocations for easier memory usage debugging. * Dupligroup no_draw option was using layers but not restrict view/render setting. (not a bugfix exactly but would do display list context switching while drawing for no reason). * Fix objects instanced on hair particles not giving consistent results when the object is transformed. * New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4, mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4. * mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple arguments. * endjob callback for WM jobs system. * Geometry node uv/color layer now has search list/autocomplete. * Various small buildsystem tweaks, not strictly needed yet in trunk. 2010-04-15 10:28:32 +00:00			`defs = []`

CMake options to disable Decimate and Boolean Modifiers: WITH_MOD_BOOLEAN, WITH_MOD_DECIMATE, renamed WITH_FLUID to WITH_MOD_FLUID 2010-10-23 15:40:13 +00:00			`# could be made optional`
			`defs += ['WITH_MOD_BOOLEAN']`
			`defs += ['WITH_MOD_DECIMATE']`

Merge various small changes from render branch: * Division by zero fix for TNT SVD code. * Sound fix, in case ffmpeg decode fails, don't use the samples. * Fix for incorrect bounds of transformed objects in new raytracing code. * Gave memory arena's a name used for allocations for easier memory usage debugging. * Dupligroup no_draw option was using layers but not restrict view/render setting. (not a bugfix exactly but would do display list context switching while drawing for no reason). * Fix objects instanced on hair particles not giving consistent results when the object is transformed. * New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4, mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4. * mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple arguments. * endjob callback for WM jobs system. * Geometry node uv/color layer now has search list/autocomplete. * Various small buildsystem tweaks, not strictly needed yet in trunk. 2010-04-15 10:28:32 +00:00			`if env['BF_NO_ELBEEM']:`
Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00			`defs.append('DISABLE_ELBEEM')`
[#14437] Modifier Stack Refactor patch by Ben Batt (artificer) Updated patch for 6 or so modifiers added since the patch was written. - tested with CMake and SCons - fixed one error were flags were being added to the fluids type. - remove BKE_simple_deform.h, simple_deform.c, move functions into MOD_simpledeform.c since there were problems with circular deps. - moved some fluid and boolean functions used by modifiers too. 2010-04-11 22:12:30 +00:00
merge from trunk at r31523 2010-09-07 05:47:34 +00:00			`env.BlenderLib ( libname = 'bf_modifiers', sources = sources,`
Merge various small changes from render branch: * Division by zero fix for TNT SVD code. * Sound fix, in case ffmpeg decode fails, don't use the samples. * Fix for incorrect bounds of transformed objects in new raytracing code. * Gave memory arena's a name used for allocations for easier memory usage debugging. * Dupligroup no_draw option was using layers but not restrict view/render setting. (not a bugfix exactly but would do display list context switching while drawing for no reason). * Fix objects instanced on hair particles not giving consistent results when the object is transformed. * New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4, mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4. * mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple arguments. * endjob callback for WM jobs system. * Geometry node uv/color layer now has search list/autocomplete. * Various small buildsystem tweaks, not strictly needed yet in trunk. 2010-04-15 10:28:32 +00:00			`includes = Split(incs), defines=defs,`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`<<<<<<< .working`
scons fix, should work now yaypython scons/scons.py 2010-09-26 06:03:46 +00:00			`libtype=['core','player'], priority = [161, 20] )`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`=======`
Tweak priority so link error on Linux is solved. Reported by Hypercrush on IRC. 2011-02-14 21:00:49 +00:00			`libtype=['core','player'], priority = [80, 40] )`
merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00			`>>>>>>> .merge-right.r35190`