diff options
| author | David Robillard <d@drobilla.net> | 2013-03-23 19:14:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-03-23 19:14:32 +0000 |
| commit | 5db4f44b621edcf957aa7bc194bc7de0aca4d5f5 (patch) | |
| tree | 4bcd9599cde8c5028f8a8a67f26ba6f6c01d5f43 | |
| parent | 47c6a8b49b297e4dba52fee225ae33ac6183cebb (diff) | |
| download | suil-5db4f44b621edcf957aa7bc194bc7de0aca4d5f5.tar.gz suil-5db4f44b621edcf957aa7bc194bc7de0aca4d5f5.tar.bz2 suil-5db4f44b621edcf957aa7bc194bc7de0aca4d5f5.zip | |
Fix check for LV2 1.4.1 when building recursively.
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5096 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/x11_in_gtk2.c | 12 | ||||
| -rw-r--r-- | src/x11_in_qt4.cpp | 8 | ||||
| -rw-r--r-- | wscript | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c index 72bbee5..13986ce 100644 --- a/src/x11_in_gtk2.c +++ b/src/x11_in_gtk2.c @@ -32,7 +32,7 @@ struct _SuilX11Wrapper { GtkPlug* plug; SuilWrapper* wrapper; SuilInstance* instance; -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 const LV2UI_Idle_Interface* idle_iface; #endif }; @@ -50,7 +50,7 @@ on_plug_removed(GtkSocket* sock, gpointer data) { SuilX11Wrapper* const self = SUIL_X11_WRAPPER(sock); -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 g_idle_remove_by_data(self); #endif @@ -158,7 +158,7 @@ suil_x11_wrapper_init(SuilX11Wrapper* self) self->plug = GTK_PLUG(gtk_plug_new(0)); self->wrapper = NULL; self->instance = NULL; -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 self->idle_iface = NULL; #endif } @@ -170,7 +170,7 @@ wrapper_resize(LV2UI_Feature_Handle handle, int width, int height) return 0; } -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 static gboolean suil_x11_wrapper_idle(void* data) { @@ -192,7 +192,7 @@ wrapper_wrap(SuilWrapper* wrapper, wrap->wrapper = wrapper; wrap->instance = instance; -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 const LV2UI_Idle_Interface* idle_iface = suil_instance_extension_data( instance, LV2_UI__idleInterface); if (idle_iface) { @@ -246,7 +246,7 @@ suil_wrapper_new(SuilHost* host, suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize); -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL); #endif diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp index 152b371..bd079ab 100644 --- a/src/x11_in_qt4.cpp +++ b/src/x11_in_qt4.cpp @@ -21,7 +21,7 @@ #include "./suil_config.h" #include "./suil_internal.h" -#ifndef HAVE_NEW_LV2 +#ifndef HAVE_LV2_1_4_1 typedef struct _LV2UI_Idle_Interface LV2UI_Idle_Interface; #endif @@ -40,7 +40,7 @@ public: , _ui_timer(0) {} -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 void showEvent(QShowEvent* event) { if (_idle_iface && _ui_timer == 0) { _ui_timer = this->startTimer(30); @@ -68,7 +68,7 @@ wrapper_wrap(SuilWrapper* wrapper, SuilInstance* instance) { const LV2UI_Idle_Interface* idle_iface = NULL; -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 idle_iface = (const LV2UI_Idle_Interface*)suil_instance_extension_data( instance, LV2_UI__idleInterface); #endif @@ -113,7 +113,7 @@ suil_wrapper_new(SuilHost* host, suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize); -#ifdef HAVE_NEW_LV2 +#ifdef HAVE_LV2_1_4_1 suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL); #endif @@ -53,7 +53,7 @@ def configure(conf): autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2') autowaf.check_pkg(conf, 'lv2', atleast_version='1.4.1', - uselib_store='NEW_LV2', mandatory=False) + uselib_store='LV2_1_4_1', mandatory=False) autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', atleast_version='2.18.0', mandatory=False) @@ -186,7 +186,7 @@ def build(bld): cflags = cflags, lib = modlib, linkflags = bld.env.NODELETE_FLAGS) - autowaf.use_lib(bld, obj, 'GTK2 GTK2_X11 LV2 NEW_LV2') + autowaf.use_lib(bld, obj, 'GTK2 GTK2_X11 LV2 LV2_1_4_1') if bld.is_defined('HAVE_GTK2') and sys.platform == 'win32': obj = bld(features = 'cxx cxxshlib', @@ -209,7 +209,7 @@ def build(bld): install_path = module_dir, cflags = cflags, lib = modlib) - autowaf.use_lib(bld, obj, 'QT4 LV2 NEW_LV2') + autowaf.use_lib(bld, obj, 'QT4 LV2 LV2_1_4_1') # Documentation autowaf.build_dox(bld, 'SUIL', SUIL_VERSION, top, out) |