forked from bartvdbraak/blender
Scons ToDo:
* Made Smoke building optional, added WITH_BF_SMOKE. * Enabled per default in btools.py
This commit is contained in:
parent
44f10d889e
commit
48ed63b1a5
@ -154,6 +154,7 @@ def validate_arguments(args, bc):
|
||||
'WITH_BF_BOOLEAN',
|
||||
'WITH_BF_REMESH',
|
||||
'WITH_BF_OCEANSIM',
|
||||
'WITH_BF_SMOKE',
|
||||
'WITH_BF_CXX_GUARDEDALLOC',
|
||||
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
|
||||
'BUILDBOT_BRANCH',
|
||||
@ -264,6 +265,7 @@ def read_opts(env, cfg, args):
|
||||
(BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
|
||||
(BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
|
||||
(BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)),
|
||||
(BoolVariable('WITH_BF_SMOKE', 'Build with smoke simulation', True)),
|
||||
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
|
||||
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
|
||||
('BF_OPENAL', 'Base path for OpenAL', ''),
|
||||
|
@ -23,7 +23,9 @@ incs += ' ' + env['BF_ZLIB_INC']
|
||||
|
||||
defs = [ 'GLEW_STATIC' ]
|
||||
|
||||
defs.append('WITH_SMOKE') # TODO, make optional
|
||||
if env['WITH_BF_SMOKE']:
|
||||
defs.append('WITH_SMOKE')
|
||||
|
||||
defs.append('WITH_FRAMESERVER') # TODO, make optional
|
||||
|
||||
if env['WITH_BF_PYTHON']:
|
||||
|
@ -13,6 +13,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
||||
|
||||
incs += ' ' + env['BF_OPENGL_INC']
|
||||
|
||||
defs.append('WITH_SMOKE') # TODO, make optional
|
||||
if env['WITH_BF_SMOKE']:
|
||||
defs.append('WITH_SMOKE')
|
||||
|
||||
env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] )
|
||||
|
@ -14,7 +14,8 @@ cxxflags_raytrace = env['CXXFLAGS']
|
||||
defs = []
|
||||
defs_raytrace = []
|
||||
|
||||
defs.append('WITH_SMOKE') # TODO, make optional
|
||||
if env['WITH_BF_SMOKE']:
|
||||
defs.append('WITH_SMOKE')
|
||||
|
||||
if env['WITH_BF_PYTHON']:
|
||||
incs += ' ../python'
|
||||
|
Loading…
Reference in New Issue
Block a user