X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fwscript;h=6f872c987f301441c2ebe7518e3037403d7bd25e;hb=444b9e89033aa4171254a3622c583e1d791c7e9f;hp=a9ac3d5f6374ca31d1e33f66a677110f43dc12c0;hpb=63b3d06fd7ef82bca9150b9dd7c178fc97b844e3;p=ardour.git

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index a9ac3d5f63..6f872c987f 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -4,7 +4,6 @@ from waflib import Options
 from waflib import TaskGen
 import os
 import sys
-import re
 
 # Version of this package (even if built as a child)
 MAJOR = '4'
@@ -38,10 +37,10 @@ libpbd_sources = [
     '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',
@@ -50,7 +49,6 @@ libpbd_sources = [
     'ffs.cc',
     'file_utils.cc',
     'fpu.cc',
-    'glib_semaphore.cc',
     'id.cc',
     'locale_guard.cc',
     'localtime_r.cc',
@@ -63,6 +61,7 @@ libpbd_sources = [
     'pool.cc',
     'property_list.cc',
     'pthread_utils.cc',
+    'reallocpool.cc',
     'receiver.cc',
     'resource.cc',
     'search_path.cc',
@@ -78,6 +77,7 @@ libpbd_sources = [
     'textreceiver.cc',
     'timer.cc',
     'timing.cc',
+    'tlsf.cc',
     'transmitter.cc',
     'undo.cc',
     'uuid.cc',
@@ -97,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)
@@ -114,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'):
@@ -146,10 +147,10 @@ def build(bld):
     if bld.env['build_target'] == 'x86_64':
         obj.defines += [ 'USE_X86_64_ASM' ]
     if bld.env['build_target'] == 'mingw':
-        if re.search ('/^x86_64/', str(bld.env['CC'])):
-            obj.defines += [ 'USE_X86_64_ASM' ]
-            obj.defines += ['NO_POSIX_MEMALIGN' ]
+        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'):
@@ -161,11 +162,15 @@ def build(bld):
                 test/mutex_test.cc
                 test/scalar_properties.cc
                 test/signals_test.cc
-                test/timer_test.cc
                 test/convert_test.cc
                 test/filesystem_test.cc
+                test/natsort_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'
@@ -174,6 +179,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()