X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fwscript;h=b952b637532a1cffc82f1e8d28f227068cc97f23;hb=27ab352f5bd33072cd8e26441ed440ad155dbb64;hp=8bd00bcff9ff73526b65215c300312f9aceb2099;hpb=fa701b8c065251d242342b86a54d91826d2290a0;p=ardour.git

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 8bd00bcff9..b952b63753 100644
--- 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,31 +58,41 @@ 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
 		dmalloc.cc
                 enums.cc
+                epa.cc
 		error.cc
 		filesystem.cc
 		filesystem_paths.cc
+		file_manager.cc
 		file_utils.cc
 		fpu.cc
 		id.cc
                 locale_guard.cc
                 malign.cc
 		mountpoint.cc
+                openuri.cc
 		pathscanner.cc
 		pool.cc
+                property_list.cc
 		pthread_utils.cc
 		receiver.cc
 		search_path.cc
+		semutils.cc
 		shortpath.cc
 		signals.cc
+                sndfile_manager.cc
 		stacktrace.cc
 		stateful_diff_command.cc
 		stateful.cc
@@ -96,7 +110,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"']
@@ -104,6 +122,20 @@ def build(bld):
 	if bld.env['build_target'] == 'x86_64':
 		obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
 
+	if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+		# Unit tests
+		testobj              = bld.new_task_gen('cxx', 'program')
+		testobj.source       = '''
+                        test/testrunner.cc
+			test/xpath.cc
+                        test/scalar_properties.cc
+		'''.split()
+		testobj.target       = 'run-tests'
+		testobj.includes     = obj.includes + ['test', '../pbd']
+		testobj.uselib       = 'CPPUNIT XML SNDFILE'
+		testobj.uselib_local = 'libpbd'
+
+
 def shutdown():
 	autowaf.shutdown()