diff options
| author | David Robillard <d@drobilla.net> | 2009-05-02 18:13:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-05-02 18:13:24 +0000 |
| commit | c7733b443ac6174f3dc795a4c89f4c2c59d1d90e (patch) | |
| tree | 9eef2e77c51799768e4b77977d869216717508d3 | |
| parent | 918371d52a90cb6027bd808188b2df78c0d3017a (diff) | |
Fix LV2 plugin support.
git-svn-id: svn://localhost/ardour2/branches/3.0@5027 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | gtk2_ardour/SConscript | 2 | ||||
| -rw-r--r-- | gtk2_ardour/plugin_selector.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 2 | ||||
| -rw-r--r-- | libs/ardour/wscript | 1 |
5 files changed, 7 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index ad19581cb7..13ea90441a 100644 --- a/SConstruct +++ b/SConstruct @@ -577,7 +577,7 @@ if env['LV2']: if conf.CheckPKGVersion('slv2', '0.6.4'): libraries['slv2'] = LibraryInfo() libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2') - env.Append (CCFLAGS="-DHAVE_LV2") + env.Append (CCFLAGS="-DHAVE_SLV2") else: print 'LV2 support is not enabled (SLV2 not found or older than 0.6.4 (svn))' env['LV2'] = 0 diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index f09df7263a..26195583c8 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -303,7 +303,7 @@ lv2_files = [ 'lv2_plugin_ui.cc' ] if env['LV2']: extra_sources += lv2_files - gtkardour.Append (CCFLAGS="-DHAVE_LV2") + gtkardour.Append (CCFLAGS="-DHAVE_SLV2") gtkardour.Merge ([libraries['slv2']]) diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 5f5930c41c..8932585544 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -337,7 +337,7 @@ PluginSelector::ladspa_refiller (const std::string& filterstr) void PluginSelector::lv2_refiller (const std::string& filterstr) { -#ifdef HAVE_LV2 +#ifdef HAVE_SLV2 refiller (manager->lv2_plugin_info(), filterstr, "LV2"); #endif } @@ -543,7 +543,7 @@ PluginSelector::plugin_menu() #ifdef HAVE_AUDIOUNITS all_plugs.insert (all_plugs.end(), manager->au_plugin_info().begin(), manager->au_plugin_info().end()); #endif -#ifdef HAVE_LV2 +#ifdef HAVE_SLV2 all_plugs.insert (all_plugs.end(), manager->lv2_plugin_info().begin(), manager->lv2_plugin_info().end()); #endif diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 92a3650a28..b4cf807688 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -227,6 +227,8 @@ def build(bld): obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"'] obj.cxxflags += ['-DLOCALEDIR="' + os.path.join( os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"'] + if bld.env['HAVE_SLV2']: + obj.cxxflags += ['-DHAVE_SLV2'] # Wrappers diff --git a/libs/ardour/wscript b/libs/ardour/wscript index b087e194c2..11372b885a 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -234,6 +234,7 @@ def build(bld): if bld.env['HAVE_SLV2']: obj.source += ' lv2_plugin.cc ' obj.uselib += ' SLV2 ' + obj.cxxflags += ['-DHAVE_SLV2'] def shutdown(): autowaf.shutdown() |