== SCons ==
authorNathan Letwory <nathan@letworyinteractive.com>
Mon, 17 Aug 2009 01:16:50 +0000 (01:16 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Mon, 17 Aug 2009 01:16:50 +0000 (01:16 +0000)
* 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.

SConstruct
config/darwin-config.py
config/linux2-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
intern/audaspace/SConscript
tools/Blender.py
tools/btools.py

index 5ae8914d77a915fa32e2de9c0b341fdd29cab061..406a65ac5fa9d6cf4f528033edbf18fae215f901 100644 (file)
@@ -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
index 42faafdf332ffb6befa4f6f85377b36d0f639457..5c0fa9a5086dc5e4ba03e53f4718fe88e7b4a764 100644 (file)
@@ -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)
index c1707a02cc4df3b9e6213db2ef5c2f04573309db..b642071cd2f81340aed38c276b0c7384c3b3b763 100644 (file)
@@ -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)
index 1570698d261ed4e000e9759ce77b4ca9f8810e20..d08545c129460e69e2c094f6400ba1a8f223a9b5 100644 (file)
@@ -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'
index bb1bc02ccdbdd2209534515a67647956eff2e39e..c1946e5f24e819b6fb3a091cbb740c59bdc7d10c 100644 (file)
@@ -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'
index 4cb3e720d466f40985ff9405c7e4bb958b6d8d4c..caae070359a19d1192223b1c02cf11604d7df13d 100644 (file)
@@ -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] )
index bca9ba4754d4ace8e20c5df678af24f44b46ae68..db888c38935f8f362265cca8f1b6900433bd0cfc 100644 (file)
@@ -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']:
index 543c503376eb9b5ea0d62d51f861f379951ab264..0314aba25b58bdaacad83c9e2c8d117063206a8b 100755 (executable)
@@ -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', ''),