forked from bartvdbraak/blender
== SCons ==
* add jack support for audio system. Note that for OSX jack support is still off by default, since I'm not sure about what goes where. OSX maintainers, please check and fix.
This commit is contained in:
parent
951895b619
commit
1e0fd0d4c1
@ -577,9 +577,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
|
|||||||
dllsources.append('${LCGDIR}/release/python' + ver + '.zip')
|
dllsources.append('${LCGDIR}/release/python' + ver + '.zip')
|
||||||
dllsources.append('${LCGDIR}/release/zlib.pyd')
|
dllsources.append('${LCGDIR}/release/zlib.pyd')
|
||||||
if env['BF_DEBUG']:
|
if env['BF_DEBUG']:
|
||||||
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
|
pass
|
||||||
|
#dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
|
||||||
else:
|
else:
|
||||||
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll')
|
pass
|
||||||
|
#dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll')
|
||||||
if env['WITH_BF_ICONV']:
|
if env['WITH_BF_ICONV']:
|
||||||
if env['OURPLATFORM'] == 'win64-vc':
|
if env['OURPLATFORM'] == 'win64-vc':
|
||||||
pass # we link statically to iconv on win64
|
pass # we link statically to iconv on win64
|
||||||
|
@ -112,6 +112,13 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
|
|||||||
BF_LIBSAMPLERATE_LIB = 'samplerate'
|
BF_LIBSAMPLERATE_LIB = 'samplerate'
|
||||||
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
||||||
|
|
||||||
|
# TODO - set proper paths here (add precompiled to lib/ ? )
|
||||||
|
WITH_BF_JACK = False
|
||||||
|
BF_JACK = '/usr'
|
||||||
|
BF_JACK_INC = '${BF_JACK}/include/jack'
|
||||||
|
BF_JACK_LIB = 'jack'
|
||||||
|
BF_JACK_LIBPATH = '${BF_JACK}/lib'
|
||||||
|
|
||||||
WITH_BF_SDL = True
|
WITH_BF_SDL = True
|
||||||
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
|
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
|
||||||
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
|
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
|
||||||
|
@ -27,6 +27,12 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
|
|||||||
BF_LIBSAMPLERATE_LIB = 'samplerate'
|
BF_LIBSAMPLERATE_LIB = 'samplerate'
|
||||||
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
||||||
|
|
||||||
|
WITH_BF_JACK = True
|
||||||
|
BF_JACK = '/usr'
|
||||||
|
BF_JACK_INC = '${BF_JACK}/include/jack'
|
||||||
|
BF_JACK_LIB = 'jack'
|
||||||
|
BF_JACK_LIBPATH = '${BF_JACK}/lib'
|
||||||
|
|
||||||
WITH_BF_SDL = True
|
WITH_BF_SDL = True
|
||||||
BF_SDL = '/usr' #$(shell sdl-config --prefix)
|
BF_SDL = '/usr' #$(shell sdl-config --prefix)
|
||||||
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
|
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
|
||||||
|
@ -31,6 +31,12 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
|
|||||||
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
|
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
|
||||||
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
||||||
|
|
||||||
|
WITH_BF_JACK = True
|
||||||
|
BF_JACK = LIBDIR + '/jack'
|
||||||
|
BF_JACK_INC = '${BF_JACK}/include'
|
||||||
|
BF_JACK_LIB = 'libjack'
|
||||||
|
BF_JACK_LIBPATH = '${BF_JACK}/lib'
|
||||||
|
|
||||||
WITH_BF_SDL = True
|
WITH_BF_SDL = True
|
||||||
BF_SDL = LIBDIR + '/sdl'
|
BF_SDL = LIBDIR + '/sdl'
|
||||||
BF_SDL_INC = '${BF_SDL}/include'
|
BF_SDL_INC = '${BF_SDL}/include'
|
||||||
|
@ -37,6 +37,12 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
|
|||||||
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
|
BF_LIBSAMPLERATE_LIB = 'libsamplerate'
|
||||||
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
||||||
|
|
||||||
|
WITH_BF_JACK = True
|
||||||
|
BF_JACK = LIBDIR + '/jack'
|
||||||
|
BF_JACK_INC = '${BF_JACK}/include'
|
||||||
|
BF_JACK_LIB = 'libjack'
|
||||||
|
BF_JACK_LIBPATH = '${BF_JACK}/lib'
|
||||||
|
|
||||||
WITH_BF_SDL = True
|
WITH_BF_SDL = True
|
||||||
BF_SDL = LIBDIR + '/sdl'
|
BF_SDL = LIBDIR + '/sdl'
|
||||||
BF_SDL_INC = '${BF_SDL}/include'
|
BF_SDL_INC = '${BF_SDL}/include'
|
||||||
|
@ -21,4 +21,9 @@ if env['WITH_BF_OPENAL']:
|
|||||||
incs += ' OpenAL ' + env['BF_OPENAL_INC']
|
incs += ' OpenAL ' + env['BF_OPENAL_INC']
|
||||||
defs.append('WITH_OPENAL')
|
defs.append('WITH_OPENAL')
|
||||||
|
|
||||||
|
if env['WITH_BF_JACK']:
|
||||||
|
sources += env.Glob('jack/*.cpp')
|
||||||
|
incs += ' jack ' + env['BF_JACK_INC']
|
||||||
|
defs.append('WITH_JACK')
|
||||||
|
|
||||||
env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern'], priority = [25] )
|
env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern'], priority = [25] )
|
||||||
|
@ -128,6 +128,8 @@ def setup_staticlibs(lenv):
|
|||||||
libincs += Split(lenv['BF_SDL_LIBPATH'])
|
libincs += Split(lenv['BF_SDL_LIBPATH'])
|
||||||
if lenv['WITH_BF_FFMPEG']:
|
if lenv['WITH_BF_FFMPEG']:
|
||||||
libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
|
libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
|
||||||
|
if lenv['WITH_BF_JACK']:
|
||||||
|
libincs += Split(lenv['BF_JACK_LIBPATH'])
|
||||||
if lenv['WITH_BF_OPENEXR']:
|
if lenv['WITH_BF_OPENEXR']:
|
||||||
libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
|
libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
|
||||||
if lenv['WITH_BF_STATICOPENEXR']:
|
if lenv['WITH_BF_STATICOPENEXR']:
|
||||||
@ -187,6 +189,8 @@ def setup_syslibs(lenv):
|
|||||||
syslibs += Split(lenv['BF_FFMPEG_LIB'])
|
syslibs += Split(lenv['BF_FFMPEG_LIB'])
|
||||||
if lenv['WITH_BF_OGG']:
|
if lenv['WITH_BF_OGG']:
|
||||||
syslibs += Split(lenv['BF_OGG_LIB'])
|
syslibs += Split(lenv['BF_OGG_LIB'])
|
||||||
|
if lenv['WITH_BF_JACK']:
|
||||||
|
syslibs += Split(lenv['BF_JACK_LIB'])
|
||||||
if lenv['WITH_BF_FFTW3']:
|
if lenv['WITH_BF_FFTW3']:
|
||||||
syslibs += Split(lenv['BF_FFTW3_LIB'])
|
syslibs += Split(lenv['BF_FFTW3_LIB'])
|
||||||
if lenv['WITH_BF_SDL']:
|
if lenv['WITH_BF_SDL']:
|
||||||
|
@ -31,6 +31,7 @@ def validate_arguments(args, bc):
|
|||||||
'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
|
'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
|
||||||
'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
|
'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
|
||||||
'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH',
|
'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH',
|
||||||
|
'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
|
||||||
'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH',
|
'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH',
|
||||||
'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC',
|
'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC',
|
||||||
'WITH_BF_DDS',
|
'WITH_BF_DDS',
|
||||||
@ -179,6 +180,12 @@ def read_opts(cfg, args):
|
|||||||
('BF_LIBSAMPLERATE_LIB', 'libsamplerate aka SRC library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
|
('BF_LIBSAMPLERATE_LIB', 'libsamplerate aka SRC library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
|
||||||
('BF_LIBSAMPLERATE_LIBPATH', 'libsamplerate aka SRC library path', ''),
|
('BF_LIBSAMPLERATE_LIBPATH', 'libsamplerate aka SRC library path', ''),
|
||||||
|
|
||||||
|
(BoolVariable('WITH_BF_JACK', 'Enable jack support if true', True)),
|
||||||
|
('BF_JACK', 'jack base path', ''),
|
||||||
|
('BF_JACK_INC', 'jack include path', ''),
|
||||||
|
('BF_JACK_LIB', 'jack library', ''),
|
||||||
|
('BF_JACK_LIBPATH', 'jack library path', ''),
|
||||||
|
|
||||||
('BF_PTHREADS', 'Pthreads base path', ''),
|
('BF_PTHREADS', 'Pthreads base path', ''),
|
||||||
('BF_PTHREADS_INC', 'Pthreads include path', ''),
|
('BF_PTHREADS_INC', 'Pthreads include path', ''),
|
||||||
('BF_PTHREADS_LIB', 'Pthreads library', ''),
|
('BF_PTHREADS_LIB', 'Pthreads library', ''),
|
||||||
|
Loading…
Reference in New Issue
Block a user