merge and resolve conflict with master

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index a4ec9deee8ed356ae3e3725c18a8fd42b183e270..97677bc5fc7e7cd8014fd13e3651eaf4e8c5086b 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -379,12 +379,13 @@ def build(bld):
                 ../libs/fst/vstwin.c
                 ../vst/winmain.c
         '''
-        obj.uselib = 'ALSA'
         obj.use          = [ 'libpbd',
                              'libmidipp',
                              'libtaglib',
                              'libardour',
                              'libardour_cp',
+                             'libtimecode',
+                             'libmidipp',
                              'libgtk2_ardour',
                              'libgtkmm2ext',
                              'libtaglib']
@@ -407,21 +408,22 @@ def build(bld):
         obj.source    = gtk2_ardour_sources
         obj.target = 'ardour-' + bld.env['VERSION']
         obj.includes = ['.']
+        obj.use      = [ 'libpbd',
+                         'libardour',
+                         'libardour_cp',
+                         'libtimecode',
+                         'libmidipp',
+                         'libgtk2_ardour',
+                         'libgtkmm2ext',
+                       ]
 
     # continue with setup of obj, which could be a shared library
     # or an executable.
 
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL'
+    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
     obj.uselib       += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
-    obj.use          = [ 'libpbd',
-                         'libmidipp',
-                         'ardour',
-                         'libardour_cp',
-                         'libgtkmm2ext',
-                         ]
 
     if bld.env['build_target'] == 'mingw':
        if bld.env['DEBUG'] == False: