aboutsummaryrefslogtreecommitdiff
path: root/pd/extra/choice
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2011-10-09 16:36:37 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2011-10-09 16:36:37 +0000
commit21c068f1916330e90f814bed461fe0821d1665ec (patch)
tree949b73696fff09a44b8d3eb01b70bae7174cbd14 /pd/extra/choice
parentbf8ced1efe1a032342e864edc635fa4e2676670d (diff)
checked in pd-0.43-0.src.tar.gz
svn path=/trunk/; revision=15557
Diffstat (limited to 'pd/extra/choice')
-rw-r--r--pd/extra/choice/GNUmakefile.am28
-rw-r--r--pd/extra/choice/choice.c2
-rw-r--r--pd/extra/choice/makefile2
3 files changed, 30 insertions, 2 deletions
diff --git a/pd/extra/choice/GNUmakefile.am b/pd/extra/choice/GNUmakefile.am
new file mode 100644
index 00000000..5ed60350
--- /dev/null
+++ b/pd/extra/choice/GNUmakefile.am
@@ -0,0 +1,28 @@
+## Makefile.am -- Process this file with automake to produce Makefile.in
+
+NAME=choice
+
+external_LTLIBRARIES = choice.la
+SOURCES = choice.c
+PATCHES = choice-help.pd
+OTHERDATA =
+
+###############################
+# you shouldn't need to add anything below here
+dist_external_DATA = $(PATCHES) $(OTHERDATA)
+
+AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(top_srcdir)/src -DPD
+AM_CFLAGS = @ARCH_CFLAGS@
+AM_LIBS = $(LIBM)
+AM_LDFLAGS = -module -avoid-version -shared @ARCH_LDFLAGS@ -shrext .@EXTERNAL_EXTENSION@ -L$(top_srcdir)/src
+
+externaldir = $(pkglibdir)/extra/$(NAME)
+
+
+if MINGW
+AM_LIBS += -lpd
+endif
+
+libtool: $(LIBTOOL_DEPS)
+ $(SHELL) ./config.status --recheck
diff --git a/pd/extra/choice/choice.c b/pd/extra/choice/choice.c
index b7bf23ab..a50c66ac 100644
--- a/pd/extra/choice/choice.c
+++ b/pd/extra/choice/choice.c
@@ -18,7 +18,7 @@ static t_class *choice_class;
typedef struct _elem
{
float e_age;
- float e_weight[DIMENSION];
+ t_float e_weight[DIMENSION];
} t_elem;
typedef struct _choice
diff --git a/pd/extra/choice/makefile b/pd/extra/choice/makefile
index 7fc71159..ee63e8fd 100644
--- a/pd/extra/choice/makefile
+++ b/pd/extra/choice/makefile
@@ -1,4 +1,4 @@
NAME=choice
CSYM=choice
-include ../makefile
+include ../makefile.subdir