Another attempt at improving spinlock init

[ardour.git] / headless / wscript

diff --git a/headless/wscript b/headless/wscript
index 3548324fb1f5800317105eac0c492b808cd1d75e..0aea4751c22c099bc5c8ef9f214179b3498c18d5 100644 (file)
--- a/headless/wscript
+++ b/headless/wscript
@@ -32,13 +32,13 @@ def build(bld):
     VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR'])
     if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw':
         return
-    
+
     # just the normal executable version of the GTK GUI
     obj = bld (features = 'cxx c cxxprogram')
     # this program does not do the whole hidden symbols thing
     obj.cxxflags = [ '-fvisibility=default' ]
     obj.source    = hardour_sources
-    obj.target = 'hardour-' + bld.env['VERSION']
+    obj.target = 'hardour-' + str (bld.env['VERSION'])
     obj.includes = ['.']
 
     # at this point, "obj" refers to either the normal native executable
@@ -47,18 +47,18 @@ def build(bld):
     obj.use      = [ 'libpbd',
                      'libardour',
                      'libardour_cp',
-                     'libtimecode',
+                     'libtemporal',
                      'libmidipp',
                      ]
 
     obj.defines = [
-        'VERSIONSTRING="' + bld.env['VERSION'] + '"',
+        'VERSIONSTRING="' + str(bld.env['VERSION']) + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         ]
     obj.install_path = bld.env['LIBDIR']
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
     obj.uselib       += ' FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX LO '
     obj.uselib       += ' TAGLIB '
@@ -74,26 +74,3 @@ def build(bld):
 
     if bld.is_defined('NEED_INTL'):
         obj.linkflags = ' -lintl'
-
-    # Wrappers
-
-    wrapper_subst_dict = {
-            'INSTALL_PREFIX' : bld.env['PREFIX'],
-            'LIBDIR'         : os.path.normpath(bld.env['LIBDIR']),
-            'DATADIR'        : os.path.normpath(bld.env['DATADIR']),
-            'CONFDIR'        : os.path.normpath(bld.env['CONFDIR']),
-            'LIBS'           : 'build/libs',
-            'VERSION'        : bld.env['VERSION'],
-            'EXECUTABLE'     : 'build/headless/hardour-' + bld.env['VERSION']
-    }
-
-    def set_subst_dict(obj, dict):
-        for i in dict:
-            setattr(obj, i, dict[i])
-
-    obj              = bld(features = 'subst', rule= 'chmod 0755 ${TGT}')
-    obj.source       = 'hardev_common.sh.in'
-    obj.target       = 'hardev_common_waf.sh'
-    obj.chmod        = Utils.O755
-    obj.dict         = wrapper_subst_dict
-    set_subst_dict(obj, wrapper_subst_dict)