diff options
| author | David Robillard <d@drobilla.net> | 2019-04-14 22:46:15 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-04-14 22:46:15 +0200 |
| commit | 41e0a56c1d9ec16d3ec722940a9cc94c48544869 (patch) | |
| tree | e8f63f5201956822fefe751d6d6c2564c77161b9 | |
| parent | f164950f61a0dad02a1bce247087a0323eeab322 (diff) | |
| download | suil-41e0a56c1d9ec16d3ec722940a9cc94c48544869.tar.gz suil-41e0a56c1d9ec16d3ec722940a9cc94c48544869.tar.bz2 suil-41e0a56c1d9ec16d3ec722940a9cc94c48544869.zip | |
Use modern LV2 includes
| -rw-r--r-- | src/cocoa_in_gtk2.mm | 4 | ||||
| -rw-r--r-- | src/qt5_in_gtk2.cpp | 4 | ||||
| -rw-r--r-- | src/suil_internal.h | 2 | ||||
| -rw-r--r-- | src/win_in_gtk2.cpp | 4 | ||||
| -rw-r--r-- | src/x11_in_gtk2.c | 4 | ||||
| -rw-r--r-- | src/x11_in_gtk3.c | 4 | ||||
| -rw-r--r-- | suil/suil.h | 2 | ||||
| -rw-r--r-- | wscript | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/cocoa_in_gtk2.mm b/src/cocoa_in_gtk2.mm index 3ff87d0..27ed9ac 100644 --- a/src/cocoa_in_gtk2.mm +++ b/src/cocoa_in_gtk2.mm @@ -22,8 +22,8 @@ #include "./suil_internal.h" -#include "lv2/lv2plug.in/ns/ext/options/options.h" -#include "lv2/lv2plug.in/ns/ext/urid/urid.h" +#include "lv2/options/options.h" +#include "lv2/urid/urid.h" #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 #define NSEventTypeFlagsChanged NSFlagsChanged diff --git a/src/qt5_in_gtk2.cpp b/src/qt5_in_gtk2.cpp index 4c77c4d..eac44af 100644 --- a/src/qt5_in_gtk2.cpp +++ b/src/qt5_in_gtk2.cpp @@ -21,8 +21,8 @@ #include <QWidget> #include <QWindow> -#include "lv2/lv2plug.in/ns/ext/options/options.h" -#include "lv2/lv2plug.in/ns/ext/urid/urid.h" +#include "lv2/options/options.h" +#include "lv2/urid/urid.h" #include "./suil_internal.h" diff --git a/src/suil_internal.h b/src/suil_internal.h index ecafbcf..e08a865 100644 --- a/src/suil_internal.h +++ b/src/suil_internal.h @@ -33,7 +33,7 @@ static inline char* dlerror(void) { return "Unknown error"; } #include <dlfcn.h> #endif -#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" +#include "lv2/ui/ui.h" #include "suil/suil.h" #include "./suil_config.h" diff --git a/src/win_in_gtk2.cpp b/src/win_in_gtk2.cpp index 70c7c1a..f2cca1a 100644 --- a/src/win_in_gtk2.cpp +++ b/src/win_in_gtk2.cpp @@ -28,8 +28,8 @@ #include "./suil_internal.h" -#include "lv2/lv2plug.in/ns/ext/options/options.h" -#include "lv2/lv2plug.in/ns/ext/urid/urid.h" +#include "lv2/options/options.h" +#include "lv2/urid/urid.h" extern "C" { diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c index 13195d9..b16fe37 100644 --- a/src/x11_in_gtk2.c +++ b/src/x11_in_gtk2.c @@ -18,8 +18,8 @@ #include <gtk/gtk.h> #include <string.h> -#include "lv2/lv2plug.in/ns/ext/options/options.h" -#include "lv2/lv2plug.in/ns/ext/urid/urid.h" +#include "lv2/options/options.h" +#include "lv2/urid/urid.h" #include "./suil_internal.h" diff --git a/src/x11_in_gtk3.c b/src/x11_in_gtk3.c index a55eb4c..ad6a95b 100644 --- a/src/x11_in_gtk3.c +++ b/src/x11_in_gtk3.c @@ -22,8 +22,8 @@ #include "./suil_internal.h" -#include "lv2/lv2plug.in/ns/ext/options/options.h" -#include "lv2/lv2plug.in/ns/ext/urid/urid.h" +#include "lv2/options/options.h" +#include "lv2/urid/urid.h" #define SUIL_TYPE_X11_WRAPPER (suil_x11_wrapper_get_type()) #define SUIL_X11_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_X11_WRAPPER, SuilX11Wrapper)) diff --git a/suil/suil.h b/suil/suil.h index 5f1b7fe..944f72e 100644 --- a/suil/suil.h +++ b/suil/suil.h @@ -23,7 +23,7 @@ #include <stdint.h> -#include "lv2/lv2plug.in/ns/lv2core/lv2.h" +#include "lv2/core/lv2.h" #ifdef _WIN32 # define SUIL_LIB_IMPORT __declspec(dllimport) @@ -56,7 +56,7 @@ def configure(conf): mandatory = False)): conf.env.NODELETE_FLAGS = ['-Wl,-z,nodelete'] - autowaf.check_pkg(conf, 'lv2', atleast_version='1.12.0', uselib_store='LV2') + autowaf.check_pkg(conf, 'lv2', atleast_version='1.16.0', uselib_store='LV2') autowaf.check_pkg(conf, 'x11', uselib_store='X11', mandatory=False) if not conf.options.no_gtk: |