summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-10-31 20:22:57 -0400
committerDavid Robillard <d@drobilla.net>2014-10-31 20:46:09 -0400
commit324ab35abca1ee8dbf24842dc149b15dd54d23e3 (patch)
tree0cfb9303d8a781860f09f1a543381ee1edda6749
parent0a60077a617a5bf7a600e34def4439283434dc69 (diff)
Use precise define names for LV2 version configure checks.
-rw-r--r--libs/ardour/lv2_plugin.cc6
-rw-r--r--libs/ardour/wscript4
-rw-r--r--msvc_extra_headers/ardourext/sys/targetsxs.h.input2
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index bbe94e15c2..7a8054ff5c 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -67,7 +67,7 @@
#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_2_0
#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
#include "lv2/lv2plug.in/ns/ext/options/options.h"
#endif
@@ -348,13 +348,13 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
_features[6] = &_log_feature;
unsigned n_features = 7;
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_2_0
_features[n_features++] = &_def_state_feature;
#endif
lv2_atom_forge_init(&_impl->forge, _uri_map.urid_map());
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_2_0
LV2_URID atom_Int = _uri_map.uri_to_id(LV2_ATOM__Int);
LV2_Options_Option options[] = {
{ LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__minBlockLength),
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index f6ed6e649a..dd618f9bcd 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -265,8 +265,8 @@ def configure(conf):
if Options.options.lv2:
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
atleast_version='1.0.0', mandatory=True)
- autowaf.check_pkg(conf, 'lv2', uselib_store='NEW_LV2',
- atleast_version='1.0.15', mandatory=False)
+ autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0',
+ atleast_version='1.2.0', mandatory=False)
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',
diff --git a/msvc_extra_headers/ardourext/sys/targetsxs.h.input b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
index 29d380f4ad..e508df083d 100644
--- a/msvc_extra_headers/ardourext/sys/targetsxs.h.input
+++ b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
@@ -7,7 +7,7 @@
#define LV2_SUPPORT 1
#define HAVE_SUIL 1
#define HAVE_LV2 1
-#define HAVE_NEW_LV2 1
+#define HAVE_LV2_1_2_0 1
/* Comment out the above lines to build Mixbus without LV2 support */
#endif