summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-01-04 23:44:49 +0000
committerDavid Robillard <d@drobilla.net>2010-01-04 23:44:49 +0000
commit1a0911f2f0d4ae67ea860fbdce58e1334995a6d3 (patch)
treec0af034882a8bbb555250f7186a1eba00b81500d
parentbfca1f3a2739c1c0148b0641d3bdb8f4ea16b431 (diff)
downloadingen-1a0911f2f0d4ae67ea860fbdce58e1334995a6d3.tar.gz
ingen-1a0911f2f0d4ae67ea860fbdce58e1334995a6d3.tar.bz2
ingen-1a0911f2f0d4ae67ea860fbdce58e1334995a6d3.zip
Fix LV2Object::from_atom to match prototype.
Link libingen_shared against OSC if necessary. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2334 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/shared/LV2Object.cpp2
-rw-r--r--src/shared/LV2Object.hpp2
-rw-r--r--src/shared/wscript2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/LV2Object.cpp b/src/shared/LV2Object.cpp
index 657bee29..c3ea6541 100644
--- a/src/shared/LV2Object.cpp
+++ b/src/shared/LV2Object.cpp
@@ -32,7 +32,7 @@ namespace LV2Object {
bool
-to_atom(World* world, LV2_Object* object, Raul::Atom& atom)
+to_atom(World* world, const LV2_Object* object, Raul::Atom& atom)
{
SharedPtr<LV2URIMap> map = PtrCast<LV2URIMap>(world->lv2_features->feature(LV2_URI_MAP_URI));
diff --git a/src/shared/LV2Object.hpp b/src/shared/LV2Object.hpp
index 1e72c4e0..dc587e92 100644
--- a/src/shared/LV2Object.hpp
+++ b/src/shared/LV2Object.hpp
@@ -29,7 +29,7 @@ class World;
namespace LV2Object {
bool to_atom(World* world, const LV2_Object* object, Raul::Atom& atom);
- bool from_atom(World* word, const Raul::Atom& atom, LV2_Object* object);
+ bool from_atom(World* word, const Raul::Atom& atom, LV2_Object* object);
} // namespace LV2Object
diff --git a/src/shared/wscript b/src/shared/wscript
index 27105f43..540d4e83 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -27,5 +27,5 @@ def build(bld):
obj.target = 'ingen_shared'
obj.vnum = '0.0.0'
obj.install_path = '${LIBDIR}'
- autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM')
+ autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM LIBLO')