major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI...

[ardour.git] / libs / pbd / wscript

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 5e21f8ce7def542d20529441a249c04bb9209b76..e114cbe1ae00fa3051988958e74834ceccd24434 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import autowaf
 import os
+import sys
 
 # Version of this package (even if built as a child)
 MAJOR = '4'
@@ -31,18 +32,16 @@ def configure(conf):
        autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc',
                        'libpbd', MAJOR, MINOR, MICRO)
        autowaf.configure(conf)
-       autowaf.check_tool(conf, 'compiler_cxx')
+       conf.check_tool('compiler_cxx')
        autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
        autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
-       autowaf.check_pkg(conf, 'uuid', uselib_store='UUID')
+       if sys.platform != 'darwin':
+               autowaf.check_pkg(conf, 'uuid', uselib_store='UUID')
 
        conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT')
+       conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO')
 
-       # This must be defined for libpbd only, it breaks ardour
-       conf.check(header_name='execinfo.h', define_name='PBD_HAVE_EXECINFO')
-
-       conf.env.append_value('CXXFLAGS', '-DHAVE_WAFCONFIG_H')
-       conf.write_config_header('wafconfig.h')
+       conf.write_config_header('libpbd-config.h')
 
        # Boost headers
        autowaf.check_header(conf, 'boost/shared_ptr.hpp')
@@ -54,9 +53,11 @@ def build(bld):
        obj.source = '''
                basename.cc
                base_ui.cc
+                boost_debug.cc
                command.cc
                convert.cc
                controllable.cc
+                crossthread.cc
                enumwriter.cc
                dmalloc.cc
                error.cc
@@ -65,6 +66,8 @@ def build(bld):
                file_utils.cc
                fpu.cc
                id.cc
+                locale_guard.cc
+                malign.cc
                mountpoint.cc
                pathscanner.cc
                pool.cc
@@ -92,9 +95,10 @@ def build(bld):
        obj.vnum         = LIBPBD_LIB_VERSION
        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
        obj.cxxflags     = ['-DPACKAGE="libpbd"']
-       if bld.env['PBD_HAVE_EXECINFO']:
-               obj.cxxflags += ['-DHAVE_EXECINFO']
-       
+
+       if bld.env['build_target'] == 'x86_64':
+               obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
+
 def shutdown():
        autowaf.shutdown()