ardour/livetrax
13
0
Fork 0
Code

explicit checks for all components of the LV2 stack

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12465 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-28 13:51:26 +00:00
parent 3696f98e6f
commit d825f20a32
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/main.cc
View File

@ -423,10 +423,6 @@ sigpipe_handler (int /*signal*/)
}
}
#ifdef HAVE_LV2
void close_external_ui_windows();
#endif
#ifdef WINDOWS_VST_SUPPORT
extern int windows_vst_gui_init (int* argc, char** argv[]);
@ -534,9 +530,6 @@ int main (int argc, char *argv[])
ARDOUR::cleanup ();
pthread_cancel_all ();
#ifdef HAVE_LV2
close_external_ui_windows();
#endif
return 0;
}
#ifdef WINDOWS_VST_SUPPORT

19
libs/ardour/wscript
View File

@ -256,11 +256,19 @@ def configure(conf):
autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
atleast_version='2.0')
if Options.options.lv2:
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
atleast_version='1.0.0', mandatory=True)
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
atleast_version='0.14.0', mandatory=True)
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
atleast_version='0.8.0', mandatory=True)
autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
atleast_version='0.2.0', mandatory=True)
autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
atleast_version='0.14.0', mandatory=False)
if conf.is_defined('HAVE_LILV'):
autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
atleast_version='0.6.0', mandatory=False)
atleast_version='0.14.0', mandatory=True)
autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
atleast_version='0.6.0', mandatory=False)
conf.define ('LV2_SUPPORT', 1)
# autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH',
# mandatory=False)
@ -332,9 +340,6 @@ int main(int argc, char **argv) {
if ogg_supported():
conf.define ('HAVE_OGG', 1)
if Options.options.lv2 and conf.is_defined('HAVE_LILV'):
conf.define ('LV2_SUPPORT', 1)
conf.write_config_header('libardour-config.h', remove=False)
# Boost headers