diff options
| -rw-r--r-- | SConstruct | 6 | ||||
| -rw-r--r-- | config/darwin-config.py | 7 | ||||
| -rw-r--r-- | config/linux2-config.py | 6 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 6 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 6 | ||||
| -rw-r--r-- | intern/audaspace/SConscript | 5 | ||||
| -rw-r--r-- | tools/Blender.py | 4 | ||||
| -rwxr-xr-x | tools/btools.py | 7 |
8 files changed, 45 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 5ae8914d77a..406a65ac5fa 100644 --- a/SConstruct +++ b/SConstruct @@ -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/zlib.pyd') 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: - 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['OURPLATFORM'] == 'win64-vc': pass # we link statically to iconv on win64 diff --git a/config/darwin-config.py b/config/darwin-config.py index 42faafdf332..5c0fa9a5086 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -112,6 +112,13 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' BF_LIBSAMPLERATE_LIB = 'samplerate' 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 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags) diff --git a/config/linux2-config.py b/config/linux2-config.py index c1707a02cc4..b642071cd2f 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -27,6 +27,12 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' BF_LIBSAMPLERATE_LIB = 'samplerate' 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 BF_SDL = '/usr' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 1570698d261..d08545c1294 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -31,6 +31,12 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' BF_LIBSAMPLERATE_LIB = 'libsamplerate' 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 BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index bb1bc02ccdb..c1946e5f24e 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -37,6 +37,12 @@ BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include' BF_LIBSAMPLERATE_LIB = 'libsamplerate' 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 BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index 4cb3e720d46..caae070359a 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -21,4 +21,9 @@ if env['WITH_BF_OPENAL']: incs += ' OpenAL ' + env['BF_OPENAL_INC'] 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] ) diff --git a/tools/Blender.py b/tools/Blender.py index bca9ba4754d..db888c38935 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -128,6 +128,8 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_SDL_LIBPATH']) if lenv['WITH_BF_FFMPEG']: libincs += Split(lenv['BF_FFMPEG_LIBPATH']) + if lenv['WITH_BF_JACK']: + libincs += Split(lenv['BF_JACK_LIBPATH']) if lenv['WITH_BF_OPENEXR']: libincs += Split(lenv['BF_OPENEXR_LIBPATH']) if lenv['WITH_BF_STATICOPENEXR']: @@ -187,6 +189,8 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_FFMPEG_LIB']) if lenv['WITH_BF_OGG']: syslibs += Split(lenv['BF_OGG_LIB']) + if lenv['WITH_BF_JACK']: + syslibs += Split(lenv['BF_JACK_LIB']) if lenv['WITH_BF_FFTW3']: syslibs += Split(lenv['BF_FFTW3_LIB']) if lenv['WITH_BF_SDL']: diff --git a/tools/btools.py b/tools/btools.py index 543c503376e..0314aba25b5 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -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_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_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', 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC', '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_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_INC', 'Pthreads include path', ''), ('BF_PTHREADS_LIB', 'Pthreads library', ''), |