From d3715261b8ff4793117296590190ebb3f2324f36 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Thu, 19 Jun 2003 02:36:59 +0000 Subject: "" svn path=/trunk/; revision=720 --- externals/grill/flext/config-pd-darwin.txt | 5 +++++ externals/grill/flext/flext.cw | Bin 789029 -> 789029 bytes externals/grill/flext/makefile.pd-darwin | 8 ++++++++ externals/grill/flext/source/flprefix.h | 6 ++++++ externals/grill/flext/source/flsupport.h | 1 - externals/grill/flext/tutorial/maxmsp/ex-bind1.pat | Bin 0 -> 1509 bytes .../grill/flext/tutorial/maxmsp/ex-buffer1.pat | Bin 0 -> 1364 bytes externals/grill/xsample/makefile.pd-darwin | 6 +++--- 8 files changed, 22 insertions(+), 4 deletions(-) create mode 100755 externals/grill/flext/tutorial/maxmsp/ex-bind1.pat create mode 100755 externals/grill/flext/tutorial/maxmsp/ex-buffer1.pat diff --git a/externals/grill/flext/config-pd-darwin.txt b/externals/grill/flext/config-pd-darwin.txt index bf207a73..a50a2f28 100644 --- a/externals/grill/flext/config-pd-darwin.txt +++ b/externals/grill/flext/config-pd-darwin.txt @@ -26,3 +26,8 @@ INSTDIR=/usr/local/pd/flext # additional compiler flags # (check if they fit for your system!) UFLAGS=-DFLEXT_USE_SIMD -malign-power -maltivec + +# define to use old library naming for backwards compatibility +# ("flext.a" instead of new "libflext.a" etc.) +V4_NAMING=1 + diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw index 544a5198..333da537 100644 Binary files a/externals/grill/flext/flext.cw and b/externals/grill/flext/flext.cw differ diff --git a/externals/grill/flext/makefile.pd-darwin b/externals/grill/flext/makefile.pd-darwin index c97f96db..c84c3163 100644 --- a/externals/grill/flext/makefile.pd-darwin +++ b/externals/grill/flext/makefile.pd-darwin @@ -27,6 +27,7 @@ LIBS=gcc # ---------------------------------------------- NAME=flext + SRCDIR=source # all the source files from the package @@ -48,10 +49,17 @@ endif CFLAGS+=-framework Carbon -framework veclib -Fveclib -FCarbon MAKEFILE=makefile.pd-darwin +ifdef V4_NAMING TARGET=$(TARGDIR)/lib$(NAME).a TARGET_D=$(TARGDIR)/lib$(NAME)_d.a TARGET_T=$(TARGDIR)/lib$(NAME)_t.a TARGET_TD=$(TARGDIR)/lib$(NAME)_td.a +else +TARGET=$(TARGDIR)/$(NAME).a +TARGET_D=$(TARGDIR)/$(NAME)_d.a +TARGET_T=$(TARGDIR)/$(NAME)_t.a +TARGET_TD=$(TARGDIR)/$(NAME)_td.a +endif TARGET_S=$(TARGDIR)/lib$(NAME).dylib TARGET_SD=$(TARGDIR)/lib$(NAME)_d.dylib diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h index 87f976a7..390f51ab 100755 --- a/externals/grill/flext/source/flprefix.h +++ b/externals/grill/flext/source/flprefix.h @@ -298,6 +298,12 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif // ----- set threading model ----- +// shared builds are always threaded (although this not be so....) +#ifdef FLEXT_SHARED + #undef FLEXT_THREADS + #define FLEXT_THREADS +#endif + #ifdef FLEXT_THREADS #undef FLEXT_THREADS #if FLEXT_OS == FLEXT_OS_MAC && FLEXT_SYS == FLEXT_SYS_MAX diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index 98fbe441..6762c9c2 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -986,7 +986,6 @@ protected: #else #define FLEXT_SETUPFUNC SetupSingle #endif - static void FLEXT_SETUPFUNC(); static bool chktilde(const char *objname); diff --git a/externals/grill/flext/tutorial/maxmsp/ex-bind1.pat b/externals/grill/flext/tutorial/maxmsp/ex-bind1.pat new file mode 100755 index 00000000..96421f2d Binary files /dev/null and b/externals/grill/flext/tutorial/maxmsp/ex-bind1.pat differ diff --git a/externals/grill/flext/tutorial/maxmsp/ex-buffer1.pat b/externals/grill/flext/tutorial/maxmsp/ex-buffer1.pat new file mode 100755 index 00000000..979774ac Binary files /dev/null and b/externals/grill/flext/tutorial/maxmsp/ex-buffer1.pat differ diff --git a/externals/grill/xsample/makefile.pd-darwin b/externals/grill/xsample/makefile.pd-darwin index e6714efe..e0f49793 100755 --- a/externals/grill/xsample/makefile.pd-darwin +++ b/externals/grill/xsample/makefile.pd-darwin @@ -13,14 +13,14 @@ CONFIG=config-pd-darwin.txt include ${CONFIG} -FLEXTLIB=flext +FLEXTLIB=$(FLEXTPATH)/libflext.a # compiler stuff INCLUDES=$(PDINC) FLAGS=-DFLEXT_SYS=2 CFLAGS=${UFLAGS} -dynamic -O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -funroll-loops -fmove-all-movables -frerun-loop-opt -fno-rtti -fno-exceptions -LIBS=m gcc $(FLEXTLIB) -LDFLAGS=-bundle -bundle_loader $(PDBIN) +LIBS=m gcc +LDFLAGS=$(FLEXTLIB) -bundle -bundle_loader $(PDBIN) FRAMEWORKS=Carbon # ---------------------------------------------- -- cgit v1.2.1