X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fwscript;h=18b13e3054828a9e267bda2b07dd9e159f8ace41;hb=a0558694dfdb2a89d54e22d30916ea0118b39301;hp=0b3b5dbf2dabf6794fe221738f36f82683eca72e;hpb=64490e88e4f8c5fe7ad04ac25ca7f1d2cb29f90e;p=ardour.git

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 0b3b5dbf2d..18b13e3054 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -34,12 +34,14 @@ libpbd_sources = [
     'boost_debug.cc',
     'cartesian.cc',
     'command.cc',
+    'configuration_variable.cc',
     'convert.cc',
     'controllable.cc',
     'controllable_descriptor.cc',
     'crossthread.cc',
     'cpus.cc',
     'debug.cc',
+    'demangle.cc',
     'enumwriter.cc',
     'event_loop.cc',
     'enums.cc',
@@ -48,7 +50,6 @@ libpbd_sources = [
     'ffs.cc',
     'file_utils.cc',
     'fpu.cc',
-    'glib_semaphore.cc',
     'id.cc',
     'locale_guard.cc',
     'localtime_r.cc',
@@ -61,6 +62,7 @@ libpbd_sources = [
     'pool.cc',
     'property_list.cc',
     'pthread_utils.cc',
+    'reallocpool.cc',
     'receiver.cc',
     'resource.cc',
     'search_path.cc',
@@ -74,10 +76,11 @@ libpbd_sources = [
     'strsplit.cc',
     'system_exec.cc',
     'textreceiver.cc',
+    'timer.cc',
+    'timing.cc',
     'transmitter.cc',
     'undo.cc',
     'uuid.cc',
-    'version.cc',
     'whitespace.cc',
     'xml++.cc',
 ]
@@ -87,8 +90,6 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
-    autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc',
-                    'libpbd', MAJOR, MINOR, MICRO, 'LIBPBD_API', 'pbd/libpbd_visibility.h')
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
@@ -96,7 +97,8 @@ def configure(conf):
     conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT',mandatory=False)
     conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False)
     conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
-    conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600', define_name='HAVE_POSIX_MEMALIGN', mandatory=False)
+    if not Options.options.ppc:
+        conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600', define_name='HAVE_POSIX_MEMALIGN', mandatory=False)
     conf.check(function_name='localtime_r', header_name='time.h', define_name='HAVE_LOCALTIME_R',mandatory=False)
 
     conf.write_config_header('libpbd-config.h', remove=False)
@@ -113,7 +115,7 @@ def configure(conf):
 def build(bld):
 
     # Make signals_generated.h using signals.py
-    bld(rule = 'python ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
+    bld(rule = sys.executable + ' ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
 
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
@@ -145,7 +147,10 @@ def build(bld):
     if bld.env['build_target'] == 'x86_64':
         obj.defines += [ 'USE_X86_64_ASM' ]
     if bld.env['build_target'] == 'mingw':
+        obj.defines += [ 'NO_POSIX_MEMALIGN' ]
         obj.source += [ 'windows_special_dirs.cc' ]
+        obj.source += [ 'windows_timer_utils.cc' ]
+        obj.source += [ 'windows_mmcss.cc' ]
         obj.uselib += ' OLE'
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
@@ -159,8 +164,12 @@ def build(bld):
                 test/signals_test.cc
                 test/convert_test.cc
                 test/filesystem_test.cc
+                test/reallocpool_test.cc
+                test/xml_test.cc
                 test/test_common.cc
         '''.split()
+        if bld.env['build_target'] == 'mingw':
+            testobj.source += [ 'test/windows_timer_utils_test.cc' ]
         testobj.target       = 'run-tests'
         testobj.includes     = obj.includes + ['test', '../pbd']
         testobj.uselib       = 'CPPUNIT XML SNDFILE'
@@ -169,6 +178,6 @@ def build(bld):
         testobj.defines      = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
         if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
             testobj.linkflags    = ['-lrt']
-            
+
 def shutdown():
     autowaf.shutdown()