diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-29 22:31:29 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-29 22:31:29 -0500 |
| commit | 3c98de9ce4bf6754a10710cfcd4400b5ebaaaa88 (patch) | |
| tree | 4679c4f5f9b8afc16f050f6587d9b18f49b715ea /gtk2_ardour/wscript | |
| parent | 680c64246e4ee9f3eb53da079dea6a7ecf996e92 (diff) | |
| parent | d1cc7e5a50e2144d7aea01bc5eceed6657513c1b (diff) | |
fix merge with master
Diffstat (limited to 'gtk2_ardour/wscript')
| -rw-r--r-- | gtk2_ardour/wscript | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index f4cb37dfc3..fc40276fac 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -365,15 +365,14 @@ 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', 'libcanvas' ] obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' @@ -395,22 +394,23 @@ 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', - 'libcanvas' - ] + if bld.is_defined('USE_EXTERNAL_LIBS'): obj.uselib += ' TAGLIB' else: |