summaryrefslogtreecommitdiffstats
path: root/src/progs/demolition
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-06-10 04:01:53 +0000
committerDavid Robillard <d@drobilla.net>2006-06-10 04:01:53 +0000
commit9a3d8d0604a2f81e3514e8a1a30aaf41aadf73a2 (patch)
tree87747e973904777ab553bb456d354f487a943f15 /src/progs/demolition
parenta8014efbed9eae51ebb78433f7173c8fdbef70eb (diff)
downloadingen-9a3d8d0604a2f81e3514e8a1a30aaf41aadf73a2.tar.gz
ingen-9a3d8d0604a2f81e3514e8a1a30aaf41aadf73a2.tar.bz2
ingen-9a3d8d0604a2f81e3514e8a1a30aaf41aadf73a2.zip
Actually got all this stuff building again
git-svn-id: http://svn.drobilla.net/lad/grauph@21 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/demolition')
-rw-r--r--src/progs/demolition/DemolitionClientInterface.h2
-rw-r--r--src/progs/demolition/Makefile.am6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h
index 374008b5..7b114c52 100644
--- a/src/progs/demolition/DemolitionClientInterface.h
+++ b/src/progs/demolition/DemolitionClientInterface.h
@@ -43,7 +43,7 @@ public:
void bundle_begin() {}
void bundle_end() {}
- void num_plugins(size_t num) {}
+ void num_plugins(uint32_t num) {}
// OSC thread functions
void error(const string& msg);
diff --git a/src/progs/demolition/Makefile.am b/src/progs/demolition/Makefile.am
index 4854f045..64fb3315 100644
--- a/src/progs/demolition/Makefile.am
+++ b/src/progs/demolition/Makefile.am
@@ -1,11 +1,11 @@
EXTRA_DIST = README
-om_demolition_CXXFLAGS = -I$(top_srcdir)/src/clients -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS)
-om_demolition_LDADD = ../libomclient.a $(LOSC_LIBS) $(LXML2_LIBS)
+om_demolition_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" $(LXML2_CFLAGS) $(LOSC_CFLAGS)
+om_demolition_LDADD = ../../libs/client/libomclient.la $(LOSC_LIBS) $(LXML2_LIBS)
bin_PROGRAMS = om_demolition
-om_demolition_DEPENDENCIES = ../libomclient.a
+om_demolition_DEPENDENCIES = ../../libs/client/libomclient.la
om_demolition_SOURCES = \
DemolitionClientInterface.h \