diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-31 13:16:51 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-31 13:16:51 -0400 |
| commit | ea1ccb869a152d7344f498d2a062867f5bcf9d0b (patch) | |
| tree | ef3b8dc9d60cd7d1da9ba439384336c1b0009ca2 /gtk2_ardour/wscript | |
| parent | b80ae88154fbc1b23c97fe60192a304280c8542c (diff) | |
| parent | f2300164d7a89c5e433d3293dfed4c1ab77f0553 (diff) | |
fix merge with master
Diffstat (limited to 'gtk2_ardour/wscript')
| -rw-r--r-- | gtk2_ardour/wscript | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 52fd7b18cb..f4cb37dfc3 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -264,6 +264,8 @@ def configure(conf): # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', + mandatory=True) autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -399,16 +401,20 @@ def build(bld): obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL GTKMM LO' + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' + obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F' + obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' obj.use = [ 'libpbd', 'libmidipp', - 'libtaglib', - 'libardour', + 'ardour', 'libardour_cp', 'libgtkmm2ext', - 'libtaglib', 'libcanvas' ] + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib += ' TAGLIB' + else: + obj.use.append('libtaglib') if sys.platform == 'darwin': obj.uselib += ' AUDIOUNITS OSX GTKOSX' obj.use += ' libappleutility' |