diff options
-rw-r--r-- | libs/ardour/wscript | 8 | ||||
-rw-r--r-- | libs/backends/jack/wscript | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 485a2284bc..b99e70e6bb 100644 --- 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', @@ -347,7 +343,7 @@ def build(bld): obj.name = 'ardour' 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 diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript index 98c39c7b16..0bfb016e31 100644 --- a/libs/backends/jack/wscript +++ b/libs/backends/jack/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf +from waflib import Options import os import sys import re @@ -19,6 +20,14 @@ def options(opt): autowaf.set_options(opt) def configure(conf): + # + # PortAudio is currently used to get a list of audio device names. + # We should find a better way to do this that doesn't involve this + # kind of dependency. + # + if Options.options.dist_target == 'mingw': + autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO', + atleast_version='19') autowaf.configure(conf) def build(bld): @@ -34,7 +43,10 @@ def build(bld): obj.cxxflags = [ '-fPIC' ] obj.name = 'jack_audiobackend' obj.target = 'jack_audiobackend' - obj.uselib = [ 'JACK' ] + if Options.options.dist_target == 'mingw': + obj.uselib = [ 'JACK', 'PORTAUDIO' ] + else: + obj.uselib = [ 'JACK' ] obj.use = 'ardour libpbd' obj.vnum = JACKBACKEND_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends') |