Move PBD symbol demangle functions into pbd/demangle.h/cc

[ardour.git] / libs / pbd / wscript

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index e20131b068e17d4c973522eabfee7780cc72ed85..00cc6634eb9e4d3e3aac9987fe74bdc4596482f0 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -41,6 +41,7 @@ libpbd_sources = [
     'crossthread.cc',
     'cpus.cc',
     'debug.cc',
+    'demangle.cc',
     'enumwriter.cc',
     'event_loop.cc',
     'enums.cc',
@@ -48,6 +49,7 @@ libpbd_sources = [
     'error.cc',
     'ffs.cc',
     'file_utils.cc',
+    'fpu.cc',
     'glib_semaphore.cc',
     'id.cc',
     'locale_guard.cc',
@@ -95,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)
@@ -144,18 +147,11 @@ def build(bld):
     if bld.env['build_target'] == 'x86_64':
         obj.defines += [ 'USE_X86_64_ASM' ]
     if bld.env['build_target'] == 'mingw':
-        import re
-        import platform as PLATFORM
-        u = PLATFORM.uname ()
-        cpu = u[4]
-        if re.search ("(x86_64|AMD64)", cpu) != None:
-            obj.defines += [ 'USE_X86_64_ASM' ]
-            obj.defines += ['NO_POSIX_MEMALIGN' ]
+        obj.defines += [ 'NO_POSIX_MEMALIGN' ]
         obj.source += [ 'windows_special_dirs.cc' ]
-        obj.source += [ 'msvc/fpu.cc' ]
+        obj.source += [ 'windows_timer_utils.cc' ]
+        obj.source += [ 'windows_mmcss.cc' ]
         obj.uselib += ' OLE'
-    else:
-        obj.source += [ 'fpu.cc' ]
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests
@@ -166,11 +162,13 @@ 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/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'
@@ -179,6 +177,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()