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/cmake | |
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/cmake')
-rw-r--r-- | build_files/cmake/macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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) |