From 10c31a5881c3bdb9d5259170335d05d2c35ab0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 9 Apr 2009 10:34:44 +0000 Subject: removed the MISSING_LOADER_T define-quirk and instead check whether the Pd-version is at least 0.42; remove the -export_dynamic compiler flag svn path=/trunk/externals/iem/iemguts/; revision=10993 --- src/Makefile | 4 ++-- src/autoabstraction.c | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 13340bf..2598b81 100644 --- a/src/Makefile +++ b/src/Makefile @@ -68,11 +68,11 @@ TARGETS=$(SOURCES:.c=.$(EXTENSION)) l_ia64 l_i386 pd_linux: $(TARGETS) -LINUXCFLAGS = -DPD -DMISSING_LOADER_T -g -O2 -funroll-loops -fomit-frame-pointer -fPIC \ +LINUXCFLAGS = -DPD -g -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch -LINUXLDFLAGS = -export_dynamic -shared -lc -lm +LINUXLDFLAGS = -shared -lc -lm LINUXINCLUDE = -I$(PDSRCDIR) diff --git a/src/autoabstraction.c b/src/autoabstraction.c index 50be5a7..9eec17d 100644 --- a/src/autoabstraction.c +++ b/src/autoabstraction.c @@ -44,11 +44,12 @@ static char*s_templatestring="#N canvas 0 0 450 300 10; #X vis 1;"; #if (PD_MINOR_VERSION >= 40) -# define AUTOABSTRACTION_ENABLED +# define AUTOABSTRACTION_ENABLED 1 #endif #ifdef AUTOABSTRACTION_ENABLED + # include "s_stuff.h" # include "g_canvas.h" # include @@ -64,12 +65,12 @@ static char*s_templatestring="#N canvas 0 0 450 300 10; #X vis 1;"; # include # endif -# ifdef MISSING_LOADER_T -/* definitions taken from s_loader.c, since they weren't in header orignally */ -typedef int (*loader_t)(t_canvas *canvas, char *classname); -void sys_register_loader(loader_t loader); -void class_set_extern_dir(t_symbol *s); -# endif +#if (PD_MINOR_VERSION < 42) + /* definitions taken from s_loader.c, since they weren't in header orignally */ + typedef int (*loader_t)(t_canvas *canvas, char *classname); + void sys_register_loader(loader_t loader); + void class_set_extern_dir(t_symbol *s); +#endif static t_binbuf*s_bb=0; -- cgit v1.2.1