Fix deadlock.

[ardour.git] / libs / pbd / wscript

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 7052ad98ca280df4a32fb8a28501721cee8f74c4..a2c880275034da4d23ffd2fdca1c8d98c43149b9 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -2,6 +2,7 @@
 import autowaf
 import os
 import sys
+import TaskGen
 
 # Version of this package (even if built as a child)
 MAJOR = '4'
@@ -40,6 +41,9 @@ def configure(conf):
 
        conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT')
        conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO')
+       conf.check(header_name='unistd.h', define_name='HAVE_UNISTD')
+       if conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', ccflags='-D_XOPEN_SOURCE=600') == False:
+               conf.define ('NO_POSIX_MEMALIGN',1)
 
        conf.write_config_header('libpbd-config.h')
 
@@ -54,11 +58,14 @@ def build(bld):
                basename.cc
                base_ui.cc
                 boost_debug.cc
+                cartesian.cc
                command.cc
                convert.cc
                controllable.cc
                controllable_descriptor.cc
+                clear_dir.cc
                 crossthread.cc
+                cpus.cc
                 debug.cc
                enumwriter.cc
                 event_loop.cc
@@ -81,6 +88,7 @@ def build(bld):
                pthread_utils.cc
                receiver.cc
                search_path.cc
+               semutils.cc
                shortpath.cc
                signals.cc
                 sndfile_manager.cc
@@ -101,7 +109,11 @@ def build(bld):
        obj.includes     = ['.']
        obj.name         = 'libpbd'
        obj.target       = 'pbd'
-       obj.uselib       = 'GLIBMM SIGCPP XML UUID'
+       obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE'
+       if sys.platform == 'darwin':
+               TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
+               obj.source += 'cocoa_open_uri.mm'
+               obj.uselib += ' OSX'
        obj.vnum         = LIBPBD_LIB_VERSION
        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
        obj.cxxflags     = ['-DPACKAGE="libpbd"']
@@ -119,9 +131,10 @@ def build(bld):
                '''.split()
                testobj.target       = 'run-tests'
                testobj.includes     = obj.includes + ['test', '../pbd']
-               testobj.uselib       = 'CPPUNIT XML'
+               testobj.uselib       = 'CPPUNIT XML SNDFILE'
                testobj.uselib_local = 'libpbd'
 
+
 def shutdown():
        autowaf.shutdown()