diff options
Diffstat (limited to 'build_files')
7 files changed, 14 insertions, 21 deletions
diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index 540416ee1fb..616ddb94354 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -104,9 +104,8 @@ WITH_BF_FFTW3 = True WITH_BF_STATICFFTW3 = True # JACK -WITH_BF_JACK = False -WITH_BF_STATICJACK = True -BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' +WITH_BF_JACK = True +WITH_BF_JACK_DYNLOAD = True # Cycles WITH_BF_CYCLES = True diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py index c0ba8060712..023eb2539fa 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -104,9 +104,8 @@ WITH_BF_FFTW3 = True WITH_BF_STATICFFTW3 = True # JACK -WITH_BF_JACK = False -WITH_BF_STATICJACK = True -BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' +WITH_BF_JACK = True +WITH_BF_JACK_DYNLOAD = True # Cycles WITH_BF_CYCLES = True diff --git a/build_files/buildbot/config/user-config-player-glibc211-i686.py b/build_files/buildbot/config/user-config-player-glibc211-i686.py index a99337f03e6..9f345931684 100644 --- a/build_files/buildbot/config/user-config-player-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-player-glibc211-i686.py @@ -103,9 +103,8 @@ BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBP BF_BOOST_LIBPATH = '${BF_BOOST}/lib' # JACK -WITH_BF_JACK = False -WITH_BF_STATICJACK = True -BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' +WITH_BF_JACK = True +WITH_BF_JACK_DYNLOAD = True # Motion Tracking WITH_BF_LIBMV = False diff --git a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py index c17cff2893d..c58da9dcffb 100644 --- a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py @@ -103,9 +103,8 @@ BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBP BF_BOOST_LIBPATH = '${BF_BOOST}/lib' # JACK -WITH_BF_JACK = False -WITH_BF_STATICJACK = True -BF_JACK_LIB_STATIC = '${BF_ZLIB}/lib/libjack.a' +WITH_BF_JACK = True +WITH_BF_JACK_DYNLOAD = True # Motion Tracking WITH_BF_LIBMV = False diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 9fe76df20b9..2b5cfbc31cc 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -228,7 +228,7 @@ macro(SETUP_LIBDIRS) if(WITH_OPENAL) link_directories(${OPENAL_LIBPATH}) endif() - if(WITH_JACK) + if(WITH_JACK AND NOT WITH_JACK_DYNLOAD) link_directories(${JACK_LIBPATH}) endif() if(WITH_CODEC_SNDFILE) @@ -293,7 +293,7 @@ macro(setup_liblinks if(WITH_FFTW3) target_link_libraries(${target} ${FFTW3_LIBRARIES}) endif() - if(WITH_JACK) + if(WITH_JACK AND NOT WITH_JACK_DYNLOAD) target_link_libraries(${target} ${JACK_LIBRARIES}) endif() if(WITH_CODEC_SNDFILE) diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index b3c3907129f..543def4e836 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -147,10 +147,8 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_PYTHON_LIBPATH']) if lenv['WITH_BF_SDL']: libincs += Split(lenv['BF_SDL_LIBPATH']) - if lenv['WITH_BF_JACK']: + if lenv['WITH_BF_JACK'] and not lenv['WITH_BF_JACK_DYNLOAD']: libincs += Split(lenv['BF_JACK_LIBPATH']) - if lenv['WITH_BF_STATICJACK']: - statlibs += Split(lenv['BF_JACK_LIB_STATIC']) if lenv['WITH_BF_SNDFILE']: libincs += Split(lenv['BF_SNDFILE_LIBPATH']) if lenv['WITH_BF_OPENEXR']: @@ -292,7 +290,7 @@ 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'] and not lenv['WITH_BF_STATICJACK']: + if lenv['WITH_BF_JACK'] and not lenv['WITH_BF_JACK_DYNLOAD']: syslibs += Split(lenv['BF_JACK_LIB']) if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']: syslibs += Split(lenv['BF_SNDFILE_LIB']) diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index ee6dd20ecc0..e35c28cedf0 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -99,7 +99,7 @@ def validate_arguments(args, bc): 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', '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_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'WITH_BF_STATICJACK', 'BF_JACK_LIB_STATIC', + 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'WITH_BF_JACK_DYNLOAD', 'WITH_BF_SNDFILE', 'BF_SNDFILE', 'BF_SNDFILE_INC', 'BF_SNDFILE_LIB', 'BF_SNDFILE_LIBPATH', 'WITH_BF_STATICSNDFILE', 'BF_SNDFILE_LIB_STATIC', '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', @@ -288,12 +288,11 @@ def read_opts(env, cfg, args): ('BF_SDL_LIBPATH', 'SDL library path', ''), (BoolVariable('WITH_BF_JACK', 'Enable jack support if true', True)), - (BoolVariable('WITH_BF_STATICJACK', 'Staticly link to jack', False)), ('BF_JACK', 'jack base path', ''), ('BF_JACK_INC', 'jack include path', ''), ('BF_JACK_LIB', 'jack library', ''), ('BF_JACK_LIBPATH', 'jack library path', ''), - ('BF_JACK_LIB_STATIC', 'jack static library', ''), + (BoolVariable('WITH_BF_JACK_DYNLOAD', 'Enable runtime dynamic Jack libraries loading (works only on Linux)', False)), (BoolVariable('WITH_BF_SNDFILE', 'Enable sndfile support if true', True)), ('BF_SNDFILE', 'sndfile base path', ''), |