From 547a9740506d30ddd2f0dc3fe70b436423bc7a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 23 Aug 2012 13:26:53 +0000 Subject: don't include C-files; link them svn path=/trunk/externals/iem/iemmatrix/; revision=16171 --- src/Makefile | 5 +++-- src/mtx_qhull.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 8639655..e0eab96 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,7 +21,8 @@ TESTDIR=../tests # ????: # ALIAS: alias-objects, MUST NOT be linked statically into iemmatrix.pd_linux -CORESRC=$(LIBRARY_NAME)_binops.c $(LIBRARY_NAME)_utility.c +CORESRC=$(LIBRARY_NAME)_binops.c $(LIBRARY_NAME)_utility.c \ + mtx_qhull/list.c mtx_qhull/vectors.c mtx_qhull/zhull.c LHELPERSRC=$(LIBRARY_NAME).c $(LIBRARY_NAME)_sources.c PDOBJECTSRC=$(sort $(filter-out $(LHELPERSRC) $(CORESRC), $(filter %.c, $(wildcard *.c)))) ALIASSRC=$(subst ../alias/,,$(sort $(filter %.c, $(wildcard ../alias/*.c)))) @@ -82,7 +83,7 @@ library: $(LIBRARY_NAME) clean: - -rm -f *.$(EXT) *.o + -rm -f *.$(EXT) *.o */*.o METAFILE = ../iemmatrix-meta.pd diff --git a/src/mtx_qhull.c b/src/mtx_qhull.c index 700821f..7223b4b 100644 --- a/src/mtx_qhull.c +++ b/src/mtx_qhull.c @@ -18,9 +18,6 @@ #include "mtx_qhull/list.h" #include "mtx_qhull/vectors.h" #include "mtx_qhull/zhull.h" -#include "mtx_qhull/list.c" -#include "mtx_qhull/vectors.c" -#include "mtx_qhull/zhull.c" static t_class *mtx_qhull_class; @@ -112,6 +109,8 @@ static void mTXQhullMatrix(MTXQhull *xo, t_symbol *s, SETFLOAT(xo->list,(float)xo->hull_size); SETFLOAT(xo->list+1,(float)3); for (i=0; ihull_size; i++) { + t_atom*ap=xo->list+2+3*i; + float f=(float)getEntry(getFacetByIndex(xo->zh->facets,i)->corners,0)+1; SETFLOAT(xo->list+2+3*i, (float)getEntry( getFacetByIndex(xo->zh->facets,i)->corners,0)+1); SETFLOAT(xo->list+3+3*i, (float)getEntry( -- cgit v1.2.1