diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-27 11:19:54 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-27 11:19:54 +0400 |
commit | 31eee77a4503ac38c3d9d96a5f77df86648c700c (patch) | |
tree | 6b7454f75cf78ff485e9b28f5f768daad9cd69b1 /build_files/scons/tools/Blender.py | |
parent | 91b2b970ade21a70c3c7289cefff6c2cbb2059cd (diff) |
Fix #33518: Jack sync doesn't work in 2.64, 2.64 or 2.65 stable versions
Added new build option WITH_JACK_DYNLOAD for CMake and
WITH_BF_JACK_DYNLOAD for SCons, which means there'll be
no build-time linking against libjack and getting symbols
from libjack will happen runtime using dlopen and dlsym
tricks.
Alternative would be to use weak linking, but it'll require
having wrapper for preloading libjack.
This new options are disabled by default and they only
intended to be used on linux. Other platforms shall not
be using this and there shall be no functional changes
on non-linux platforms at all.
Diffstat (limited to 'build_files/scons/tools/Blender.py')
-rw-r--r-- | build_files/scons/tools/Blender.py | 6 |
1 files changed, 2 insertions, 4 deletions
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']) |