diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-17 19:23:39 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-17 19:23:39 +0200 |
| commit | 9ae577fb07d9aea2f48d7e0d9988f25e24893a63 (patch) | |
| tree | 2712f4cc569bea2659763dc0c25202a927c61ae5 /gtk2_ardour | |
| parent | cbea1a4a82d5bf728875d7bc88053078c0596211 (diff) | |
thread-safe fftw (needs fftw-3.3.5)
see https://github.com/FFTW/fftw3/issues/16
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/main.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index ce7dc4b5d1..e8bfe43aa1 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -25,6 +25,10 @@ #include <sigc++/bind.h> #include <gtkmm/settings.h> +#ifdef HAVE_FFTW35F +#include <fftw3.h> +#endif + #include "pbd/error.h" #include "pbd/file_utils.h" #include "pbd/textreceiver.h" @@ -283,6 +287,10 @@ int main (int argc, char *argv[]) Glib::thread_init(); } +#ifdef HAVE_FFTW35F + ftwf_make_planner_thread_safe (); +#endif + #ifdef ENABLE_NLS gtk_set_locale (); #endif diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 7b138f7ae2..e0b809608a 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -291,6 +291,8 @@ def configure(conf): autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW35F', + atleast_version='3.3.5', mandatory=False) autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -483,6 +485,9 @@ def build(bld): obj.source += [ 'lv2_plugin_ui.cc' ] obj.use += [ 'SUIL' ] + if bld.is_defined('HAVE_FFTW35F'): + obj.linkflags = ' -lfftw3_threads' + if bld.is_defined('NEED_INTL'): obj.linkflags = ' -lintl' |