Merge branch 'master' into audioengine

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index d48a4d6d85d42f4be51f5a8252a222835df7a428..57b68a0fdee9e507c4ae1fc9a91f192ae1a1a0b0 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -4,6 +4,7 @@ from waflib import Options
 import os
 import re
 import subprocess
+import sys
 
 # default state file version for this build
 CURRENT_SESSION_FILE_VERSION = 3001
@@ -21,6 +22,7 @@ path_prefix = 'libs/ardour/'
 libardour_sources = [
         'amp.cc',
         'analyser.cc',
+        'async_midi_port.cc',
         'audio_buffer.cc',
         'audio_diskstream.cc',
         'audio_library.cc',
@@ -126,6 +128,7 @@ libardour_sources = [
         'midi_stretch.cc',
         'midi_track.cc',
         'midi_ui.cc',
+        'midiport_manager.cc',
         'mix.cc',
         'monitor_processor.cc',
         'mtc_slave.cc',
@@ -177,6 +180,7 @@ libardour_sources = [
         'session_events.cc',
         'session_export.cc',
         'session_handle.cc',
+        'session_jack.cc',
         'session_ltc.cc',
         'session_metadata.cc',
         'session_midi.cc',
@@ -251,6 +255,10 @@ def configure(conf):
                       atleast_version='0.1.0')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
                       atleast_version='2.0')
+
+    if re.search ("linux", sys.platform) != None:
+        autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
+
     if Options.options.lv2:
         autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
                           atleast_version='1.0.0', mandatory=True)
@@ -448,6 +456,15 @@ def build(bld):
     obj.name     = 'jack_audiobackend'
     obj.target   = 'jack_audiobackend'
     obj.uselib   = [ 'JACK' ]
+    
+    #
+    # device discovery code in the jack backend needs ALSA
+    # on Linux.
+    # 
+
+    if re.search ("linux", sys.platform) != None:
+       obj.uselib += [ 'ALSA' ]
+
     obj.use      = [ 'ardour' ]
     obj.vnum     = '1.0.0'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')