diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
| commit | 8648a8a13b04549362f14a0738947d997ef1abc7 (patch) | |
| tree | 702652b49789b13d647c4c93df985f65361a4118 /gtk2_ardour/wscript | |
| parent | c428ec14b923928690492cab0428f8fad45f7658 (diff) | |
| parent | ae6b0b9f1ab02ab949eaf741b98e69bdab487e92 (diff) | |
fix up wscript/build issues in exportvis after merge with master
Diffstat (limited to 'gtk2_ardour/wscript')
| -rw-r--r-- | gtk2_ardour/wscript | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index e96fdc1388..417814fbb4 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -274,6 +274,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', @@ -377,15 +379,6 @@ def build(bld): ../libs/fst/vstwin.c ../vst/winmain.c ''' - obj.uselib = 'ALSA' - obj.use = [ 'libpbd', - 'libmidipp', - 'libtaglib', - 'libardour', - 'libardour_cp', - 'libgtk2_ardour', - 'libgtkmm2ext', - 'libtaglib'] obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' obj.includes = [ '../libs/fst', '.' ] obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] @@ -410,21 +403,23 @@ def build(bld): # 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.use = [ 'libpbd', + 'libardour', + 'libardour_cp', + 'libtimecode', + 'libmidipp', + 'libgtk2_ardour', + 'libgtkmm2ext', + ] - obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS ' + obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + 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', - 'libtaglib', - 'ardour', - 'libardour_cp', - 'libgtkmm2ext', - 'libtaglib', - 'timecode_includes' - ] - + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib += ' TAGLIB' + else: + obj.use.append('libtaglib') if sys.platform == 'darwin': obj.use += ' libappleutility' obj.defines += [ |