diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-08-27 22:27:30 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-08-27 22:27:30 +0000 |
| commit | fb4a845ef8dffe59b3970a97ed98b2f0cd87a7f9 (patch) | |
| tree | 28108fcd50e3ad408994e7c1cab09944503a01b5 | |
| parent | 24b359d0bfa0d59ecf9fcfb87e86fc881e4ba0ab (diff) | |
merged in relevant changes from the v0-40 pd-extended release branch
svn path=/trunk/externals/loaders/hexloader/; revision=10266
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | hexloader.c | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -3,7 +3,7 @@ # path to pd ## change this according to your setup! -PDROOT?=../../../pd +PDROOT=../../../pd #PDROOT=/Net/iem/Benutzer/zmoelnig/src/pd-0.41-0test08 # here we find the sources of pd (and evtl. the pd.lib) @@ -15,7 +15,7 @@ PDLIBDIR=$(PDROOT)/bin EXTENSION=$(MAKECMDGOALS) -DEFINES=-DPD +DEFINES=-DPD -DMISSING_LOADER_T # if no filename-extension is supplied by the user # try to guess one, based on what "uname" tells us @@ -92,7 +92,7 @@ DARWINCFLAGS = $(DEFINES) -O2 -Wall -W -Wshadow -Wstrict-prototypes \ DARWININCLUDE = -I$(PDSRCDIR) -DARWINLDFLAGS = -bundle -undefined suppress -flat_namespace +DARWINLDFLAGS = -bundle -undefined dynamic_lookup %.pd_darwin: %.c $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) $(DARWINLDFLAGS) -o $*.pd_darwin $*.c diff --git a/hexloader.c b/hexloader.c index b4067b6..5a5e663 100644 --- a/hexloader.c +++ b/hexloader.c @@ -33,7 +33,7 @@ # include <stdlib.h> # include <unistd.h> #endif -#ifdef __WIN32__ +#ifdef _WIN32 # include <io.h> # include <windows.h> #endif @@ -68,10 +68,12 @@ typedef struct _filepath typedef void (*t_hexloader_setup)(void); -/* definitions taken from s_loader.c */ +#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 /* ==================================================== */ |