Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / libs / ardour / wscript

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 485a2284bccb072d6ca76c7f64d32ba0d7539414..e8c9fb8328a7f9aace1a07b31684c4e7f11b9789 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -105,7 +105,6 @@ libardour_sources = [
         'io.cc',
         'io_processor.cc',
         'jack_slave.cc',
-        'jack_utils.cc',
         'kmeterdsp.cc',
         'ladspa_plugin.cc',
         'ladspa_search_path.cc',
@@ -252,9 +251,6 @@ def configure(conf):
     if Options.options.dist_target == 'auto':
         if re.search ("linux", sys.platform) != None:
             autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
-    if Options.options.dist_target == 'mingw':
-        autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO',
-                          atleast_version='19')
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     if Options.options.dist_target != 'mingw':
         autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF',
@@ -344,10 +340,10 @@ def build(bld):
 
     obj.export_includes = ['.']
     obj.includes     = ['.', '../surfaces/control_protocol', '..']
-    obj.name         = 'ardour'
+    obj.name         = 'libardour'
     obj.target       = 'ardour'
     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
-                        'JACK', 'ALSA', 'PORTAUDIO', 'SNDFILE','SAMPLERATE','LRDF',
+                        'JACK', 'ALSA', 'SNDFILE','SAMPLERATE','LRDF',
                         'AUDIOUNITS', 'OSX','BOOST','CURL','DL']
     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
                         'libvampplugin','libtaglib','librubberband',
@@ -447,7 +443,6 @@ def build(bld):
             create_ardour_test_program(bld, obj.includes, 'framewalk_to_beats', 'test_framewalk_to_beats', ['test/framewalk_to_beats_test.cc'])
             create_ardour_test_program(bld, obj.includes, 'framepos_plus_beats', 'test_framepos_plus_beats', ['test/framepos_plus_beats_test.cc'])
             create_ardour_test_program(bld, obj.includes, 'framepos_minus_beats', 'test_framepos_minus_beats', ['test/framepos_minus_beats_test.cc'])
-            create_ardour_test_program(bld, obj.includes, 'jack_utils', 'test_jack_utils', ['test/jack_utils_test.cc'])
             create_ardour_test_program(bld, obj.includes, 'playlist_equivalent_regions', 'test_playlist_equivalent_regions', ['test/playlist_equivalent_regions_test.cc'])
             create_ardour_test_program(bld, obj.includes, 'playlist_layering', 'test_playlist_layering', ['test/playlist_layering_test.cc'])
             create_ardour_test_program(bld, obj.includes, 'plugins_test', 'test_plugins', ['test/plugins_test.cc'])
@@ -466,7 +461,6 @@ def build(bld):
             test/framewalk_to_beats_test.cc
             test/framepos_plus_beats_test.cc
             test/framepos_minus_beats_test.cc
-            test/jack_utils_test.cc
             test/playlist_equivalent_regions_test.cc
             test/playlist_layering_test.cc
             test/plugins_test.cc