From e6df1f5fc109d8427471ff80c8bbaa9944824b43 Mon Sep 17 00:00:00 2001 From: musil Date: Thu, 4 Jul 2013 17:05:47 +0000 Subject: iemlib.h now in include folder parallel to library folder, changed makefiles,, removed iemlib.h and makefile_linux svn path=/trunk/externals/iem/iem_ambi/; revision=17185 --- src/iemlib.h | 118 ----------------------------------------------------- src/makefile | 13 +++++- src/makefile_d_fat | 7 +++- src/makefile_linux | 55 ------------------------- 4 files changed, 17 insertions(+), 176 deletions(-) delete mode 100644 src/iemlib.h delete mode 100644 src/makefile_linux diff --git a/src/iemlib.h b/src/iemlib.h deleted file mode 100644 index ac1ffce..0000000 --- a/src/iemlib.h +++ /dev/null @@ -1,118 +0,0 @@ -/* For information on usage and redistribution, and for a DISCLAIMER OF ALL -* WARRANTIES, see the file, "LICENSE.txt," in this distribution. - -iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2012 */ - -#ifndef __IEMLIB_H__ -#define __IEMLIB_H__ - - -#define IS_A_NULL(atom,index) ((atom+index)->a_type == A_NULL) -#define IS_A_POINTER(atom,index) ((atom+index)->a_type == A_POINTER) -#define IS_A_FLOAT(atom,index) ((atom+index)->a_type == A_FLOAT) -#define IS_A_SYMBOL(atom,index) ((atom+index)->a_type == A_SYMBOL) -#define IS_A_DOLLAR(atom,index) ((atom+index)->a_type == A_DOLLAR) -#define IS_A_DOLLSYM(atom,index) ((atom+index)->a_type == A_DOLLSYM) -#define IS_A_SEMI(atom,index) ((atom+index)->a_type == A_SEMI) -#define IS_A_COMMA(atom,index) ((atom+index)->a_type == A_COMMA) - -#define SETNULL(atom) ((atom)->a_type = A_NULL) - -/* now miller's code starts : - for 4 point interpolation - for lookup tables - for denormal floats - */ - -#ifdef MSW -int sys_noloadbang; -//t_symbol *iemgui_key_sym=0; -#include -#else -extern int sys_noloadbang; -//extern t_symbol *iemgui_key_sym; -#include -#endif - -#define DEFDELVS 64 -#define XTRASAMPS 4 -#define SAMPBLK 4 - -#define UNITBIT32 1572864. /* 3*2^19; bit 32 has place value 1 */ - - /* machine-dependent definitions. These ifdefs really - should have been by CPU type and not by operating system! */ -#ifdef IRIX - /* big-endian. Most significant byte is at low address in memory */ -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#define int32 long /* a data type that has 32 bits */ -#endif /* IRIX */ - -#ifdef MSW - /* little-endian; most significant byte is at highest address */ -#define HIOFFSET 1 -#define LOWOFFSET 0 -#define int32 long -#endif /* MSW */ - -#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) -#include -#endif - -#if defined(__linux__) || defined(__CYGWIN__) || defined(__GNU__) || defined(ANDROID) -#include -#endif - -#if defined(__unix__) || defined(__APPLE__) -#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) -#error No byte order defined -#endif - -#if BYTE_ORDER == LITTLE_ENDIAN -#define HIOFFSET 1 -#define LOWOFFSET 0 -#else -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#endif /* __BYTE_ORDER */ -#include -#define int32 int32_t -#endif /* __unix__ or __APPLE__*/ - -union tabfudge_d -{ - double tf_d; - int32 tf_i[2]; -}; - -union tabfudge_f -{ - float tf_f; - long tf_l; -}; - -#if defined __i386__ || defined __x86_64__ -#define IEM_DENORMAL(f) ((((*(unsigned int*)&(f))&0x60000000)==0) || \ -(((*(unsigned int*)&(f))&0x60000000)==0x60000000)) -/* more stringent test: anything not between 1e-19 and 1e19 in absolute val */ -#else - -#define IEM_DENORMAL(f) 0 - -#endif - -/* on 64bit systems we cannot use garray_getfloatarray... */ -#if ((defined PD_MAJOR_VERSION && defined PD_MINOR_VERSION) && (PD_MAJOR_VERSION > 0 || PD_MINOR_VERSION > 40)) -# define iemarray_t t_word -# define iemarray_getarray garray_getfloatwords -# define iemarray_getfloat(pointer, index) (pointer[index].w_float) -# define iemarray_setfloat(pointer, index, fvalue) (pointer[index].w_float = fvalue) -#else -# define iemarray_t t_float -# define iemarray_getarray garray_getfloatarray -# define iemarray_getfloat(pointer, index) (pointer[index]) -# define iemarray_setfloat(pointer, index, fvalue) (pointer[index] = fvalue) -#endif - -#endif diff --git a/src/makefile b/src/makefile index 8795928..ad827b8 100644 --- a/src/makefile +++ b/src/makefile @@ -1,2 +1,13 @@ -include makefile_linux +TARGET = iem_ambi + + +SRC = ambi_decode.c \ + ambi_decode2.c \ + ambi_decode3.c \ + ambi_decode_cube.c \ + ambi_encode.c \ + ambi_rot.c \ + $(TARGET).c + +include ../../Make.include diff --git a/src/makefile_d_fat b/src/makefile_d_fat index 8456b73..bce4a16 100644 --- a/src/makefile_d_fat +++ b/src/makefile_d_fat @@ -4,7 +4,10 @@ current: all PD_INSTALL_PATH ?= "/Applications/Pd.app/Contents/Resources" -INCLUDE = -I. -I$(PD_INSTALL_PATH)/src +# path to iemlib.h +IEMLIB_INCLUDE = ../../include + +INCLUDE = -I. -I$(IEMLIB_INCLUDE) -I$(PD_INSTALL_PATH)/src CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch @@ -13,7 +16,7 @@ LFLAGS = -bundle -undefined suppress -flat_namespace # the sources -SRC = ambi_decode.c \ +SRC = ambi_decode.c \ ambi_decode2.c \ ambi_decode3.c \ ambi_decode_cube.c \ diff --git a/src/makefile_linux b/src/makefile_linux deleted file mode 100644 index 22b9300..0000000 --- a/src/makefile_linux +++ /dev/null @@ -1,55 +0,0 @@ -current: all - -.SUFFIXES: .pd_linux - -PDSOURCE?=/usr/local/src/pd/src -PD_INCLUDE = -I. -I$(PDSOURCE) - -PD_LDFLAGS = -Wl,--export-dynamic -shared -fPIC -LIB = -lc -lm - -#select either the DBG and OPT compiler flags below: - -PD_CFLAGS = -DPD -DUNIX \ - -W -Wno-unused -Wno-parentheses -Wno-switch \ - -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \ - -DDL_OPEN -fPIC - -CFLAGS="-O6" - -SYSTEM = $(shell uname -m) - -# the sources - -SRC = ambi_decode.c \ - ambi_decode2.c \ - ambi_decode3.c \ - ambi_decode_cube.c \ - ambi_encode.c \ - ambi_rot.c \ - iem_ambi.c - -TARGET = iem_ambi.pd_linux - - -OBJ = $(SRC:.c=.o) - -# -# ------------------ targets ------------------------------------ -# - -clean: - -rm -f ../$(TARGET) - -rm -f *.o - -all: $(OBJ) - @echo :: $(OBJ) - $(CC) $(PD_LDFLAGS) $(LDFLAGS) -o $(TARGET) *.o $(LIB) - mv $(TARGET) .. - -$(OBJ) : %.o : %.c - $(CC) $(PD_CFLAGS) $(CFLAGS) $(PD_INCLUDE) $(INCLUDE) -c -o $*.o $*.c - - - - -- cgit v1.2.1