updated build system - some cleanups

updated for build system updated build system for OSX cleanups updated build system svn path=/trunk/; revision=2458
author: Thomas Grill <xovo@users.sourceforge.net> 2005-01-04 04:58:53 +0000
committer: Thomas Grill <xovo@users.sourceforge.net> 2005-01-04 04:58:53 +0000
commit: 7d237bf606940cede753ae1c07a59c1ec24027bf (patch)
tree: 4366a0c71e09acb4e89556964d4e23f6e3fe7631
parent: 71b359c9eeb0071f6a1dfa2befb07a619b1e75c4 (diff)
53 files changed, 125 insertions, 1588 deletions
diff --git a/externals/grill/flext/build-max-darwin.sh b/externals/grill/flext/build-max-darwin.sh
deleted file mode 100755
index b8360772..00000000
--- a/externals/grill/flext/build-max-darwin.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh  
-
-. config-max-darwin.txt
-
-make -f makefile.max-darwin &&
-{ 
-	if [ $INSTDIR != "" ]; then
-		echo Now install as root
-		sudo make -f makefile.max-darwin install
-	fi
-}
diff --git a/externals/grill/flext/build-max-msvc.bat b/externals/grill/flext/build-max-msvc.bat
deleted file mode 100644
index 9a2603c3..00000000
--- a/externals/grill/flext/build-max-msvc.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo --- Building flext with MS Visual C++ ---
-
-nmake -f makefile.max-msvc clean
-nmake -f makefile.max-msvc
diff --git a/externals/grill/flext/build-pd-bcc.bat b/externals/grill/flext/build-pd-bcc.bat
deleted file mode 100644
index 08f706c5..00000000
--- a/externals/grill/flext/build-pd-bcc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo --- Building flext with BorlandC++ ---
-
-make -f makefile.pd-bcc %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/externals/grill/flext/build-pd-cygwin.sh b/externals/grill/flext/build-pd-cygwin.sh
deleted file mode 100644
index ceed5096..00000000
--- a/externals/grill/flext/build-pd-cygwin.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. config-pd-cygwin.txt
-
-make -f makefile.pd-cygwin &&
-{
-	if [ $INSTDIR != "" ]; then
-		make -f makefile.pd-cygwin install
-	fi
-}
diff --git a/externals/grill/flext/build-pd-darwin.sh b/externals/grill/flext/build-pd-darwin.sh
deleted file mode 100644
index 1755372b..00000000
--- a/externals/grill/flext/build-pd-darwin.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh  
-
-. config-pd-darwin.txt
-
-make -f makefile.pd-darwin &&
-{ 
-	if [ $INSTDIR != "" ]; then
-		echo Now install as root
-		sudo make -f makefile.pd-darwin install
-	fi
-}
diff --git a/externals/grill/flext/build-pd-linux.sh b/externals/grill/flext/build-pd-linux.sh
deleted file mode 100644
index 7805d2d7..00000000
--- a/externals/grill/flext/build-pd-linux.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh  
-
-. config-pd-linux.txt
-
-make -f makefile.pd-linux &&
-{ 
-	echo Will now install flext to ${INSTDIR}
-	
-	if [ ${INSTDIR} != "" ]; then
-		echo Now install as root
-		su -c "make -f makefile.pd-linux install"
-	fi
-}
diff --git a/externals/grill/flext/build-pd-mingw.bat b/externals/grill/flext/build-pd-mingw.bat
deleted file mode 100644
index edab49fa..00000000
--- a/externals/grill/flext/build-pd-mingw.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-mingw32-make -f makefile.pd-mingw
-mingw32-make -f makefile.pd-mingw install
diff --git a/externals/grill/flext/build-pd-msvc.bat b/externals/grill/flext/build-pd-msvc.bat
deleted file mode 100644
index 0dc03e42..00000000
--- a/externals/grill/flext/build-pd-msvc.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo --- Building flext with MS Visual C++ ---
-
-
-nmake -f makefile.pd-msvc clean
-
-nmake -f makefile.pd-msvc
-
diff --git a/externals/grill/flext/build.bat b/externals/grill/flext/build.bat
index a7936e8b..a0670621 100644
--- a/externals/grill/flext/build.bat
+++ b/externals/grill/flext/build.bat
@@ -32,8 +32,7 @@
 @echo platform ... win / lnx / mac
 @echo system   ... pd / max
 @echo compiler ... msvc / gcc / mingw / cygwin / bcc / icc
-@echo target   ... all (default) / all-debug / all-shared / all-shared-debug / 
-@echo              clean / install
+@echo target   ... all (default) / clean / install
 @echo .
 @echo Please make sure that your make program and compiler can be accessed with the
 @echo system path and that all relevant environment variables are properly set.
diff --git a/externals/grill/flext/build/makefile-win-bcc.inc b/externals/grill/flext/build/bmake-win-bcc.inc
index 23434935..23434935 100644
--- a/externals/grill/flext/build/makefile-win-bcc.inc
+++ b/externals/grill/flext/build/bmake-win-bcc.inc
diff --git a/externals/grill/flext/build/config-mac.def b/externals/grill/flext/build/config-mac.def
new file mode 100644
index 00000000..d112b5a3
--- /dev/null
+++ b/externals/grill/flext/build/config-mac.def
@@ -0,0 +1,7 @@
+# where is the STK installation?
+# (uncomment the line with # to disable STK support)
+#STK=/usr/local/lib/stk
+
+# where is the Sndobjs installation?
+# (uncomment the line with # to disable SNDOBJ support)
+#SNDOBJ=/usr/local/lib/sndobj
diff --git a/externals/grill/flext/build/makefile-win-cygwin.inc b/externals/grill/flext/build/gnumake-mac-gcc.inc
index a119a298..a119a298 100644
--- a/externals/grill/flext/build/makefile-win-cygwin.inc
+++ b/externals/grill/flext/build/gnumake-mac-gcc.inc
diff --git a/externals/grill/flext/build/makefile-win-mingw.inc b/externals/grill/flext/build/gnumake-win-cygwin.inc
index a119a298..a119a298 100644
--- a/externals/grill/flext/build/makefile-win-mingw.inc
+++ b/externals/grill/flext/build/gnumake-win-cygwin.inc
diff --git a/externals/grill/flext/build/gnumake-win-mingw.inc b/externals/grill/flext/build/gnumake-win-mingw.inc
new file mode 100644
index 00000000..a119a298
--- /dev/null
+++ b/externals/grill/flext/build/gnumake-win-mingw.inc
@@ -0,0 +1,13 @@
+ifdef SNDOBJ
+SRCS+=$(SRCS_SNDOBJ)
+HDRS+=$(HDRS_SNDOBJ)
+INCPATH+=-I$(SNDOBJ)
+LIBS+=-lsndobj
+endif
+
+ifdef STK
+SRCS+=$(SRCS_STK)
+HDRS+=$(HDRS_STK)
+INCPATH+=-I$(STK)
+LIBS+=-lstk
+endif
diff --git a/externals/grill/flext/build/makefile-win-msvc.inc b/externals/grill/flext/build/nmake-win-msvc.inc
index 23434935..23434935 100644
--- a/externals/grill/flext/build/makefile-win-msvc.inc
+++ b/externals/grill/flext/build/nmake-win-msvc.inc
diff --git a/externals/grill/flext/buildsys/bmake-sub.mak b/externals/grill/flext/buildsys/bmake-sub.mak
index 5baa4be9..29028377 100644
--- a/externals/grill/flext/buildsys/bmake-sub.mak
+++ b/externals/grill/flext/buildsys/bmake-sub.mak
@@ -5,7 +5,7 @@
 # project-specific definitions
 
 # package info
-!include $(USRINFO)
+!include $(PKGINFO)
 
 # special package settings
 !ifdef USRCONFIG
diff --git a/externals/grill/flext/buildsys/bmake.mak b/externals/grill/flext/buildsys/bmake.mak
index ef061486..1fb937ce 100644
--- a/externals/grill/flext/buildsys/bmake.mak
+++ b/externals/grill/flext/buildsys/bmake.mak
@@ -8,23 +8,25 @@
 ###############################################
 # package info
 
-USRINFO=package.txt
+!ifndef PKGINFO
+PKGINFO=package.txt
+!endif
 
-!include $(USRINFO)
+!include $(PKGINFO)
 
 ###############################################
 # check variables
 
 !ifndef BUILDCLASS
-!error BUILDCLASS must be specified in $(USRINFO)
+BUILDCLASS=ext
 !endif
 
 !ifndef BUILDMODE
-!error BUILDMODE must be specified in $(USRINFO)
+BUILDMODE=release
 !endif
 
 !ifndef BUILDTYPE
-!error BUILDTYPE must be specified in $(USRINFO)
+BUILDTYPE=single
 !endif
 
 ##############################
@@ -44,7 +46,7 @@ SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def
 
 OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \
 	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
-	BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
+	BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS)
 
 ###############################################
 
@@ -52,7 +54,7 @@ OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \
 USRCONFIG=config.txt
 USRDEFAULT=$(BUILDDIR)\config-$(PLATFORM).def
 
-USRMAKE=$(BUILDDIR)\makefile-$(PLATFORM)-$(COMPILER).inc
+USRMAKE=$(BUILDDIR)\bmake-$(PLATFORM)-$(COMPILER).inc
 
 OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)
 !endif
diff --git a/externals/grill/flext/buildsys/gnumake-sub.mak b/externals/grill/flext/buildsys/gnumake-sub.mak
index 46a40de6..5e1dfc73 100644
--- a/externals/grill/flext/buildsys/gnumake-sub.mak
+++ b/externals/grill/flext/buildsys/gnumake-sub.mak
@@ -5,7 +5,7 @@ include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
 # project specific definitions
 
 # package info
-include $(USRINFO)
+include $(PKGINFO)
 
 # special settings
 ifdef USRCONFIG
diff --git a/externals/grill/flext/buildsys/gnumake.mak b/externals/grill/flext/buildsys/gnumake.mak
index af83c019..4d201957 100644
--- a/externals/grill/flext/buildsys/gnumake.mak
+++ b/externals/grill/flext/buildsys/gnumake.mak
@@ -8,23 +8,25 @@
 ###############################################
 # package info
 
-USRINFO=package.txt
+ifndef PKGINFO
+PKGINFO=package.txt
+endif
 
-include $(USRINFO)
+include $(PKGINFO)
 
 ###############################################
 # check variables
 
 ifndef BUILDCLASS
-	error BUILDCLASS must be specified in $(USRINFO)
+BUILDCLASS=ext
 endif
 
 ifndef BUILDMODE
-	error BUILDMODE must be specified in $(USRINFO)
+BUILDMODE=release
 endif
 
 ifndef BUILDTYPE
-	error BUILDTYPE must be specified in $(USRINFO)
+BUILDTYPE=single
 endif
 
 ##############################
@@ -53,7 +55,7 @@ SYSDEFAULT=$(UBUILDPATH)$(PLATFORM)/$(RTSYS)/config-$(COMPILER).def
 
 OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \
 	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
-	BUILDPATH=$(UBUILDPATH) USRINFO=$(USRINFO)
+	BUILDPATH=$(UBUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS)
 
 ###############################################
 
@@ -61,7 +63,7 @@ ifdef BUILDDIR
 USRCONFIG=config.txt
 USRDEFAULT=$(BUILDDIR)/config-$(PLATFORM).def
 
-USRMAKE=$(BUILDDIR)/makefile-$(PLATFORM)-$(COMPILER).inc
+USRMAKE=$(BUILDDIR)/gnumake-$(PLATFORM)-$(COMPILER).inc
 
 OPTIONS+=USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)
 endif
diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc
index ad4e2856..66a86234 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc
@@ -4,6 +4,18 @@ INCPATH += -I$(FLEXTINC)
 LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
 LIBS += -l$(FLEXTNAME)
 
+# obviously header precompilation os still buggy with gcc 3.3
+
+ifdef PRECOMPILE
+#PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)
+else
+#PRECOMSRC=$(FLEXTINC)/flext.h
+endif
+ifdef PRECOMSRC
+PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch
+PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))
+endif
+
 ##############################################
 
 CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS)))
@@ -19,33 +31,40 @@ _build_: $(TARGET)
 $(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
 	touch $@
 
+# Attention: $@ doesn't work for paths with spaces....
 $(OBJPATH):
-	-mkdir -p $@
+	-mkdir -p $(OBJPATH)
 
+# Attention: $@ doesn't work for paths with spaces....
 $(TARGETPATH):
-	-mkdir -p $@
+	-mkdir -p $(TARGETPATH)
+
+$(PRECOMDST) : $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@
 
 $(OBJPATH)/%.opp : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+	$(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
 
 $(OBJPATH)/%.o : $(SRCDIR)/%.c
 	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
 
 $(TARGET) :: $(OBJPATH) $(TARGETPATH)
 
-$(TARGET) :: $(COBJS) $(CPPOBJS)
+$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)
 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
 	chmod 755 $@
 
 ##############################################
 
 _clean_:
-	rm $(COBJS) $(CPPOBJS) $(TARGET)
+	-rm -r $(TARGETPATH)
+	-rm -r $(OBJPATH)
 
 ##############################################
 
+# Attention: $@ doesn't work for paths with spaces....
 $(INSTPATH):
-	-mkdir -p $@
+	-mkdir -p $(INSTPATH)
 
 _install_:: $(INSTPATH)
-	install $(TARGET) $(INSTPATH)
+	cp -R $(INSTTARGET) $(INSTPATH)
diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
index 1baafe86..b7c0ef8e 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
@@ -1,6 +1,8 @@
 # build class specific settings
-
-#LDFLAGS += -dylib_install_name $(FLEXTSHLIB)
+
+ifdef SHARED
+#LDFLAGS += -dylib_install_name $(FLEXTSHLIB)/$(OUTNAME).$(EXT)
+endif
 
 ##############################################
 
@@ -21,26 +23,36 @@ $(OBJPATH):
 $(TARGETPATH):
 	-mkdir -p $@
 
+ifdef PRECOMPILE
+PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)
+PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch
+PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))
+endif
+
+$(PRECOMDST): $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@
+
 $(OBJPATH)/%.opp : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+	$(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
 
 $(OBJPATH)/%.o : $(SRCDIR)/%.c
 	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
 
 $(TARGET) :: $(OBJPATH) $(TARGETPATH)
 
-$(TARGET) :: $(COBJS) $(CPPOBJS)
+$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)
 ifdef SHARED
 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
 	chmod 755 $@
-else
+else
 	libtool -static -o $@ $(COBJS) $(CPPOBJS)
 endif
-
+
 ##############################################
 
 _clean_:
-	rm $(COBJS) $(CPPOBJS) $(TARGET)
+	-rm -r $(TARGETPATH)
+	-rm -r $(OBJPATH)
 
 ##############################################
 
@@ -57,8 +69,9 @@ $(FLEXTLIBINST):
 	-mkdir -p $@
 
 _install_: $(FLEXTINC) $(FLEXTLIBINST)
-	install $(TARGET) $(FLEXTLIBINST)
-ifndef SHARED
-	ranlib $(FLEXTLIBINST)/$(OUTNAME).$(EXT)  # have to rerun ranlib at install dir ?!
+	install $(TARGET) $(FLEXTLIBINST)
+ifndef SHARED
+# have to rerun ranlib at install dir ?!
+	ranlib $(FLEXTLIBINST)/$(notdir $(TARGET))  
 endif
 	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
index 4567ec41..661c422d 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
@@ -4,7 +4,7 @@ LDFLAGS += -dynamic -Wl,-x -framework ApplicationServices -framework vecLib
 
 ##############################################
 
-ifndef DEBUG
+ifdef DEBUG
 CFLAGS += -g -D_DEBUG
 else
 CFLAGS += $(OFLAGS) -DNDEBUG
diff --git a/externals/grill/flext/buildsys/mac/max/config-gcc.def b/externals/grill/flext/buildsys/mac/max/config-gcc.def
index 41c0b490..de6c6632 100644
--- a/externals/grill/flext/buildsys/mac/max/config-gcc.def
+++ b/externals/grill/flext/buildsys/mac/max/config-gcc.def
@@ -19,7 +19,7 @@ FLEXTSHLIB=$(FLEXTLIB)
 OUTPATH=max-darwin
 
 # where should the external be installed?
-INSTPATH=/Library/Application\ Support/Cycling\ \'74/externals
+INSTPATH=/Library/Application\ Support/Cycling\ \'74/externals/flext
 
 ###############################################################
 
diff --git a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc
index 24d90d60..85e01a75 100644
--- a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc
@@ -4,5 +4,6 @@ EXT=mxo
 
 OBJPATH=$(OUTPATH)/$(OUTSUB)
 
-TARGETPATH=$(OBJPATH)/$(OUTNAME).$(EXT)/Contents/MacOS
+INSTTARGET=$(OBJPATH)/$(OUTNAME).$(EXT)
+TARGETPATH=$(INSTTARGET)/Contents/MacOS
 TARGET=$(TARGETPATH)/$(OUTNAME)
diff --git a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc
index 4cb53259..b99cfec7 100644
--- a/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/max/gnumake-gcc-flext.inc
@@ -7,6 +7,8 @@ endif
 ##############################################
 
 OBJPATH=$(OUTPATH)/$(OUTSUB)
+
 TARGETPATH=$(OBJPATH)
 TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
+INSTTARGET=$(TARGET)
 
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
index f52bc6db..90b71f03 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
@@ -1 +1,3 @@
 EXT=pd_darwin
+
+LDFLAGS += -bundle -bundle_loader $(PDBIN)
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
index 2ebf308d..7aa9b3b5 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
@@ -3,3 +3,5 @@ EXT=dylib
 else
 EXT=a
 endif
+
+LDFLAGS += -dynamiclib -flat_namespace -undefined suppress
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
index ac805f09..f00d0569 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
@@ -3,11 +3,8 @@ DEFS += -DFLEXT_SYS=2
 INCPATH += -I$(PDPATH)/src
 LIBPATH += -L$(PDPATH)/bin
 
-LDFLAGS += -bundle -bundle_loader $(PDBIN)
-
 ##############################################
 
 OBJPATH=$(OUTPATH)/$(OUTSUB)
 TARGETPATH=$(OBJPATH)
 TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
-
diff --git a/externals/grill/flext/buildsys/nmake-sub.mak b/externals/grill/flext/buildsys/nmake-sub.mak
index 81ba3983..1a69cbab 100644
--- a/externals/grill/flext/buildsys/nmake-sub.mak
+++ b/externals/grill/flext/buildsys/nmake-sub.mak
@@ -5,7 +5,7 @@
 # project-specific definitions
 
 # package info
-!include $(USRINFO)
+!include $(PKGINFO)
 
 # special package settings
 !ifdef USRCONFIG
diff --git a/externals/grill/flext/buildsys/nmake.mak b/externals/grill/flext/buildsys/nmake.mak
index 5fe434b4..78bd0ec0 100644
--- a/externals/grill/flext/buildsys/nmake.mak
+++ b/externals/grill/flext/buildsys/nmake.mak
@@ -8,23 +8,25 @@
 ###############################################
 # package info
 
-USRINFO=package.txt
+!ifndef PKGINFO
+PKGINFO=package.txt
+!endif
 
-!include $(USRINFO)
+!include $(PKGINFO)
 
 ###############################################
 # check variables
 
 !ifndef BUILDCLASS
-!error BUILDCLASS must be specified in $(USRINFO)
+BUILDCLASS=ext
 !endif
 
 !ifndef BUILDMODE
-!error BUILDMODE must be specified in $(USRINFO)
+BUILDMODE=release
 !endif
 
 !ifndef BUILDTYPE
-!error BUILDTYPE must be specified in $(USRINFO)
+BUILDTYPE=single
 !endif
 
 ##############################
@@ -44,7 +46,7 @@ SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def
 
 OPTIONS=-f $(BUILDPATH)nmake-sub.mak \
 	PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
-	BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
+	BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS)
 
 ###############################################
 
@@ -52,7 +54,7 @@ OPTIONS=-f $(BUILDPATH)nmake-sub.mak \
 USRCONFIG=config.txt
 USRDEFAULT=$(BUILDDIR)\config-$(PLATFORM).def
 
-USRMAKE=$(BUILDDIR)\makefile-$(PLATFORM)-$(COMPILER).inc
+USRMAKE=$(BUILDDIR)\nmake-$(PLATFORM)-$(COMPILER).inc
 
 OPTIONS=$(OPTIONS) USRCONFIG=$(USRCONFIG) USRMAKE=$(USRMAKE)
 !endif
diff --git a/externals/grill/flext/config-max-darwin.txt b/externals/grill/flext/config-max-darwin.txt
deleted file mode 100755
index f29aa86d..00000000
--- a/externals/grill/flext/config-max-darwin.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-# CXX=g++-3.3
-
-# where is the Max SDK? (version 4.5 upwards!!)
-MAXSDKPATH="/Volumes/Daten/Prog/MaxMSP-SDK/4.5 headers/c74support"
-
-# where is the SndObj include directory? 
-# (leave blank or comment out to disable SndObj support)
-# SNDOBJ=/usr/src/sndobj/include
-
-# where is the STK include directory?
-# (leave blank or comment out to disable STK support)
-# STK=/usr/src/stk/include
-
-# where should flext libraries be built?
-TARGDIR=./max-darwin
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-INSTDIR="/Library/Application Support/Cycling '74/flext"
-
-# additional compiler flags
-# (check if they fit for your system!)
-UFLAGS=-DFLEXT_USE_SIMD -malign-power -maltivec -faltivec
diff --git a/externals/grill/flext/config-max-msvc.txt b/externals/grill/flext/config-max-msvc.txt
deleted file mode 100644
index a1d62c63..00000000
--- a/externals/grill/flext/config-max-msvc.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
-#
-
-# where is the Max SDK?
-MAXSDKPATH="C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support"	
-
-# where is MS VC++? 
-# (should be commented out when called from the Visual Studio Command prompt)
-# MSVCPATH="c:\programme\prog\microsoft visual studio\VC98"
-
-# where is the SndObj include directory?
-# headers are searched in SNDOBJ/include, the sndobj.lib in SNDOBJ/lib
-# (leave blank or comment out to disable SndObj support)
-# SNDOBJ=f:\prog\audio\sndobj
-
-# where is the STK include directory?
-# headers are searched in STK/include, the stk.lib in STK/lib
-# (leave blank or comment out to disable STK support)
-# STK=f:\prog\audio\stk
-
-# where should flext libraries be built?
-# object files will be placed in subfolders
-OUTPATH=".\max-msvc" 
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-INSTDIR="%CommonProgramFiles%\Cycling '74\flext"
-
-# user-definable compiler flags
-# e.g. FLEXT_USE_SIMD enables SIMD support for capable CPUs (for VC++ 6, you need the Processor Pack)
-UFLAGS=/DFLEXT_USE_SIMD /G6 /arch:SSE
diff --git a/externals/grill/flext/config-pd-bcc.txt b/externals/grill/flext/config-pd-bcc.txt
deleted file mode 100644
index 5d111ed5..00000000
--- a/externals/grill/flext/config-pd-bcc.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
-#
-
-# where is PD?
-PDPATH=c:\programme\audio\pd		
-
-# where is BorlandC++?
-BCCPATH=c:\programme\prog\bcc55		
-
-# where is the SndObj include directory? 
-# (leave blank or comment out to disable SndObj support)
-SNDOBJ=c:\data\prog\audio\sndobj\include
-
-# where is the STK include directory? 
-# (leave blank or comment out to disable STK support)
-STK=c:\data\prog\audio\stk\include
-
-# build directory for flext libraries?
-OUTPATH=.\pd-bcc
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-INSTDIR=$(PDPATH)\flext
diff --git a/externals/grill/flext/config-pd-cygwin.txt b/externals/grill/flext/config-pd-cygwin.txt
deleted file mode 100644
index e596da76..00000000
--- a/externals/grill/flext/config-pd-cygwin.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-# CXX=g++
-
-# where is PD?
-PDPATH=/cygdrive/c/programme/audio/pd
-
-# where is the SndObj include directory? 
-# (leave blank or comment out to disable SndObj support)
-# SNDOBJ=/cygdrive/f/prog/audio/sndobj/include
-
-# where is the STK include directory?
-# (leave blank or comment out to disable STK support)
-# STK=/cygdrive/f/prog/audio/stk/include
-
-# where should flext libraries be built?
-TARGDIR=./pd-cygwin
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-INSTDIR=${PDPATH}/flext
-
-# additional compiler flags
-# (check if they fit for your system!)
-UFLAGS=-mcpu=pentium4 -msse
-\ No newline at end of file
diff --git a/externals/grill/flext/config-pd-darwin.txt b/externals/grill/flext/config-pd-darwin.txt
deleted file mode 100644
index f6fa6f86..00000000
--- a/externals/grill/flext/config-pd-darwin.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-# CXX=g++-3.3
-
-# where are the PD header files? (m_pd.h, m_imp.h, g_canvas.h)
-PDPATH=/Applications/audio/Pd-0.38-0test13.app/Contents/Resources/src
-
-# where is the SndObj include directory? 
-# (leave blank or comment out to disable SndObj support)
-# SNDOBJ=/usr/src/sndobj/include
-
-# where is the STK include directory?
-# (leave blank or comment out to disable STK support)
-# STK=/usr/src/stk/include
-
-# where should flext libraries be built?
-TARGDIR=./pd-darwin
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-INSTDIR=/Applications/audio/Pd-0.38-0test10.app/Contents/Resources/flext
-
-# additional compiler flags
-# (check if they fit for your system!)
-UFLAGS=-DFLEXT_USE_SIMD -maltivec -faltivec
-
-
-
-
-
diff --git a/externals/grill/flext/config-pd-linux.txt b/externals/grill/flext/config-pd-linux.txt
deleted file mode 100644
index cdc89a0c..00000000
--- a/externals/grill/flext/config-pd-linux.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-# CXX=g++
-
-# where are the PD header files? (m_pd.h, m_imp.h, g_canvas.h)
-# if it is a system include path (like /usr/local/include) 
-# you should leave it blank (as e.g. g++ 3.2 complains about it)
-PDPATH=../../../pd/src
-
-# where is the SndObj include directory?
-# (leave blank or comment out to disable SndObj support)
-#SNDOBJ=/usr/local/include
-
-# where is the STK include directory?
-# (leave blank or comment out to disable STK support)
-#STK=/usr/src/stk-4.1.1/include
-
-# where should flext libraries be built?
-TARGDIR=./pd-linux
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-# Note: the shared libraries will also be installed there. For them to be found you have to add this folder 
-# to the path of the dynamic linker, e.g. by adding a line in /etc/ld.so.conf
-INSTDIR=/usr/local/lib/pd/flext
-
-# additional compiler flags
-# (check if they fit for your system!)
-# UFLAGS=-mcpu=pentiumpro # gcc 2.95
-# UFLAGS=-mcpu=pentium3 -msse  # gcc 3.2
-
diff --git a/externals/grill/flext/config-pd-mingw.txt b/externals/grill/flext/config-pd-mingw.txt
deleted file mode 100644
index 132d4ccb..00000000
--- a/externals/grill/flext/config-pd-mingw.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-# CXX=g++
-
-# where is PD?
-PDPATH=c:/programme/audio/pd
-
-# where is the SndObj include directory? 
-# (leave blank or comment out to disable SndObj support)
-#SNDOBJ=f:/prog/audio/sndobj/include
-
-# where is the STK include directory?
-# (leave blank or comment out to disable STK support)
-#STK=f:/prog/audio/stk/include
-
-# where should flext libraries be built?
-TARGDIR=./pd-mingw
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-INSTDIR=${PDPATH}/flext
-
-# additional compiler flags
-# (check if they fit for your system!)
-UFLAGS=-mcpu=pentium4 -msse
-\ No newline at end of file
diff --git a/externals/grill/flext/config-pd-msvc.txt b/externals/grill/flext/config-pd-msvc.txt
deleted file mode 100644
index fdbe841c..00000000
--- a/externals/grill/flext/config-pd-msvc.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (gr@grrrr.org)
-#
-
-# where is PD?
-PDPATH=c:\programme\audio\pd
-
-# where is the pthreads package?
-# (comment out if you use the standard pd package where pthreads are included)
-# PTHREADS=c:\data\prog\packs\pthreads		
-
-# where is MS VC++? 
-# (should be commented out when called from the Visual Studio Command prompt)
-# MSVCPATH="c:\programme\prog\microsoft visual studio\VC98"
-
-# where is the SndObj directory?
-# headers are searched in SNDOBJ/include, the sndobj.lib in SNDOBJ/lib
-# (leave blank or comment out to disable SndObj support)
-SNDOBJ=c:\data\prog\audio\sndobj
-
-# where is the STK include directory?
-# headers are searched in STK/include, the stk.lib in STK/lib
-# (leave blank or comment out to disable STK support)
-STK=c:\data\prog\audio\stk
-
-# where should flext libraries be built?
-# object files will be placed in subfolders
-OUTPATH=".\pd-msvc" 
-
-# where should flext libraries be installed?
-# (leave blank to omit installation)
-INSTDIR=$(PDPATH)\flext
-
-# user-definable compiler flags
-# e.g. FLEXT_USE_SIMD enables SIMD support for capable CPUs (for MSVC6, you need the Processor Pack)
-UFLAGS=/DFLEXT_USE_SIMD /G6 /arch:SSE
diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.mcp
index 87686b5c..45690deb 100644
--- a/externals/grill/flext/flext.cw
+++ b/externals/grill/flext/flext.mcp
diff --git a/externals/grill/flext/make-files.txt b/externals/grill/flext/make-files.txt
deleted file mode 100644
index 38bc36af..00000000
--- a/externals/grill/flext/make-files.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-SRCDIR=source
-
-SRCS= \
-	flbase.cpp flext.cpp flbuf.cpp fldsp.cpp fllib.cpp \
-	flxlet.cpp flattr.cpp flattr_ed.cpp flsupport.cpp \
-	flutil.cpp flatom.cpp flatom_pr.cpp flthr.cpp fltimer.cpp flsimd.cpp flout.cpp \
-	flatom_app.cpp flatom_part.cpp flitem.cpp flmeth.cpp flmsg.cpp \
-	flproxy.cpp flqueue.cpp flbind.cpp
-HDRS= \
-	flprefix.h flstdc.h flbase.h flclass.h flext.h flsupport.h flmap.h fldsp.h flinternal.h \
-	fldefs.h fldefs_hdr.h fldefs_setup.h \
-	fldefs_methcb.h fldefs_meththr.h fldefs_methadd.h fldefs_methbind.h fldefs_methcall.h \
-	fldefs_attrcb.h fldefs_attrvar.h fldefs_attradd.h
-
-
-SRCS_SNDOBJ=flsndobj.cpp
-HDRS_SNDOBJ=flsndobj.h
-
-SRCS_STK=flstk.cpp
-
-HDRS_STK=flstk.h
diff --git a/externals/grill/flext/make-inc.max-msvc b/externals/grill/flext/make-inc.max-msvc
deleted file mode 100644
index d91b2b29..00000000
--- a/externals/grill/flext/make-inc.max-msvc
+++ /dev/null
@@ -1,146 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-# ----- for internal use ----------------------
-#
-
-!include config-max-msvc.txt
-
-NAME=flext
-
-# source files
-SOURCE=source
-
-# includes
-INCPATH=/I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes /I$(SOURCE)
-LDFLAGS=
-
-!ifdef MSVCPATH
-INCPATH=$(INCPATH) /I$(MSVCPATH)\include 
-LDFLAGS=$(LDFLAGS) /LIBPATH:$(MSVCPATH)\lib
-!endif
-
-# compiler definitions and flags
-DEFS=/DFLEXT_SYS=1 $(UFLAGS)
-
-CFLAGS=/GX /GD /Zp2
-OFLAGS=/Ox
-DFLAGS=/Od /Zi
-
-TARGET=maxwin  # appendix to lib name
-
-
-
-!ifdef FLEXT_SHARED
-DEFS=$(DEFS) /DFLEXT_SHARED /DFLEXT_EXPORTS 
-
-!ifdef _DEBUG
-LIBS=$(LIBS) $(MAXSDKPATH)\max-includes\win-includes\debug\maxapi.lib $(MAXSDKPATH)\msp-includes\win-includes\debug\maxaudio.lib
-!else
-LIBS=$(LIBS) $(MAXSDKPATH)\max-includes\win-includes\release\maxapi.lib $(MAXSDKPATH)\msp-includes\win-includes\release\maxaudio.lib
-!endif
-
-EXT=dll
-
-!ifndef _DEBUG
-CFLAGS=$(CFLAGS) $(OFLAGS) /MT /LD
-OBJPATH=l
-!else
-CFLAGS=$(CFLAGS) $(DFLAGS) /MTd /LDd
-OBJPATH=ld
-!endif
-
-!else
-
-EXT=lib
-
-!ifdef FLEXT_THREADS
-DEFS=$(DEFS) /DFLEXT_THREADS
-
-!ifndef _DEBUG
-CFLAGS=$(CFLAGS) $(OFLAGS) /MT
-OBJPATH=t
-!else
-CFLAGS=$(CFLAGS) $(DFLAGS) /MTd
-OBJPATH=td
-!endif
-
-!else
-
-!ifndef _DEBUG
-CFLAGS=$(CFLAGS) $(OFLAGS) /MT
-OBJPATH=s
-!else
-CFLAGS=$(CFLAGS) $(DFLAGS) /MTd
-OBJPATH=sd
-!endif
-
-!endif # FLEXT_THREADS
-
-!endif # FLEXT_SHARED
-
-
-# the rest can stay untouched
-# ----------------------------------------------
-
-# all the source files from the package
-!include make-files.txt
-
-!ifdef SNDOBJ
-SRCS=$(SRCS) $(SRCS_SNDOBJ)
-HDRS=$(HDRS) $(HDRS_SNDOBJ)
-INCPATH=$(INCPATH) /I$(SNDOBJ)/include
-!endif
-
-!ifdef STK
-SRCS=$(SRCS) $(SRCS_STK)
-HDRS=$(HDRS) $(HDRS_STK)
-INCPATH=$(INCPATH) /I$(STK)/include 
-!endif
-
-#default target
-all: $(OUTPATH)\$(NAME)-$(TARGET).$(EXT)
-
-# remove build
-clean:
-	-cd $(OUTPATH)
-	-del /s /q $(OBJPATH) > nul
-	-rmdir $(OBJPATH)
-	-cd ..
-	-del /q $(OUTPATH)\$(NAME)-$(TARGET).$(EXT) > nul
-	-rmdir $(OUTPATH)
-
-# -----------------------------------------------
-
-OBJS= $(SRCS:.cpp=.obj)
-
-{$(SOURCE)\}.cpp.obj:
-	@-if not exist $(OUTPATH) mkdir $(OUTPATH)
-	@cd $(OUTPATH)
-	@-if not exist $(OBJPATH) mkdir $(OBJPATH)
-	@cd ..
-	cl /c $(CFLAGS) $(DEFS) $(INCPATH) /Fo$(OUTPATH)\$(OBJPATH)\$@ $<
-
-
-
-$(OUTPATH)\$(NAME)-$(TARGET).lib: $(OBJS)
-	@cd $(OUTPATH)\$(OBJPATH)
-	lib /OUT:..\$(NAME)-$(TARGET).lib $(OBJS)
-	@cd ..\..
-!ifdef INSTDIR
-	@-if not exist $(OBJPATH) mkdir $(INSTDIR)
-	copy $(OUTPATH)\$(NAME)-$(TARGET).lib $(INSTDIR) > nul
-	copy $(SOURCE)\*.h $(INSTDIR) > nul
-!endif
-
-
-$(OUTPATH)\$(NAME)-$(TARGET).dll: $(OBJS)
-	@cd $(OUTPATH)\$(OBJPATH)
-	link /DLL /NOLOGO $(LDFLAGS) /OUT:..\$(NAME)-$(TARGET).dll $(LIBS) $(OBJS)
-	@cd ..\..
-!ifdef INSTDIR
-	@-if not exist $(OBJPATH) mkdir $(INSTDIR)
-	copy $(OUTPATH)\$(NAME)-$(TARGET).dll $(INSTDIR) > nul
-	copy $(SOURCE)\*.h $(INSTDIR) > nul
-!endif
-
diff --git a/externals/grill/flext/make-inc.pd-bcc b/externals/grill/flext/make-inc.pd-bcc
deleted file mode 100644
index 3e491c5e..00000000
--- a/externals/grill/flext/make-inc.pd-bcc
+++ /dev/null
@@ -1,92 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (gr@grrrr.org)
-#
-# Makefile for BorlandC++ 
-#
-# usage: make -f makefile.bcc
-
-!include config-pd-bcc.txt
-
-TARGET=pdwin  # appendix to lib name
-
-# includes
-INCPATH=-I$(BCCPATH)\include -I$(PDPATH)\src -I$(SRCDIR)
-
-# compiler definitions and flags
-DEFS=-DFLEXT_SYS=2
-CFLAGS=-tWD
-
-!ifdef DEBUG
-CFLAGS=$(CFLAGS) -v
-DEFS=$(DEFS) -DFLEXT_DEBUG
-!else
-CFLAGS=$(CFLAGS) -6 -O2 -OS -ff
-!endif
-
-!ifdef THREADED
-CFLAGS=$(CFLAGS) -tWM
-DEFS=$(DEFS) -DFLEXT_THREADS
-!endif
-
-
-# the rest can stay untouched
-# ----------------------------------------------
-
-# all the source files from the package
-!include make-files.txt
-
-!ifdef SNDOBJ
-INCPATH=$(INCPATH) -I$(SNDOBJ)
-SRCS=$(SRCS) $(SRCS_SNDOBJ)
-HDRS=$(HDRS) $(HDRS_SNDOBJ)
-!endif
-
-!ifdef STK
-INCPATH=$(INCPATH) -I$(STK)
-SRCS=$(SRCS) $(SRCS_STK)
-HDRS=$(HDRS) $(HDRS_STK)
-!endif
-
-TARGET=$(OUTPATH)\$(NAME)-$(TARGET).lib
-
-#default target
-all: $(OUTPATH) $(TARGET) $(OUTPATH)\pd.lib $(OUTPATH)\pthreadVC.lib
-
-# remove build
-clean:
-	-del /s /q $(OUTPATH) > nul
-	rmdir $(OUTPATH)
-
-# -----------------------------------------------
-
-OBJS= $(SRCS:.cpp=.obj)
-
-#.PATH.obj=$(OUTPATH)
-
-
-DIR="/"
-
-$(OUTPATH)\pd.lib: $(PDPATH)\bin\pd.dll 
-	implib -a $< $**
-
-$(OUTPATH)\pthreadVC.lib: $(PDPATH)\bin\pthreadVC.dll 
-	implib -a $< $**
-
-{$(SRCDIR)}.cpp.obj:
-	bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $<
-
-$(OUTPATH):
-	@-if not exist $< mkdir $<
-
-$(TARGET): $(OBJS) 
-	@-del "$<"
-	cd $(OUTPATH)
-	tlib "..\$<" +$(**: = +)
-	cd ..
-!if $d(INSTDIR) && "$(INSTDIR)" != ""
-	@-if not exist $(INSTDIR) mkdir $(INSTDIR)
-	-copy $< $(INSTDIR) >nul
-	-copy $(OUTPATH)\pd.lib $(INSTDIR) >nul
-	-copy $(OUTPATH)\pthreadVC.lib $(INSTDIR) >nul
-	-copy $(SRCDIR)\*.h $(INSTDIR) >nul
-!endif
diff --git a/externals/grill/flext/make-inc.pd-msvc b/externals/grill/flext/make-inc.pd-msvc
deleted file mode 100644
index 665eca2c..00000000
--- a/externals/grill/flext/make-inc.pd-msvc
+++ /dev/null
@@ -1,154 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
-#
-# ----- for internal use ----------------------
-#
-
-!include config-pd-msvc.txt
-
-NAME=flext
-
-# source files
-SOURCE=source
-
-# includes
-INCPATH=/I$(PDPATH)\src /I$(SOURCE)
-
-!ifdef MSVCPATH
-INCPATH=$(INCPATH) /I$(MSVCPATH)\include 
-!endif
-
-!ifdef PTHREADS
-INCPATH=$(INCPATH) /I$(PTHREADS)
-!endif
-
-LDFLAGS=/LIBPATH:$(MSVCPATH)\lib
-
-
-# compiler definitions and flags
-DEFS=/DFLEXT_SYS=2 $(UFLAGS)
-
-CFLAGS=/GX /GD
-OFLAGS=/Ox
-DFLAGS=/Od /Zi
-
-TARGET=pdwin  # appendix to lib name
-
-
-
-!ifdef FLEXT_SHARED
-DEFS=$(DEFS) /DFLEXT_SHARED /DFLEXT_EXPORTS 
-
-EXT=dll
-
-!ifndef _DEBUG
-CFLAGS=$(CFLAGS) $(OFLAGS) /MT /LD
-OBJPATH=l
-!else
-CFLAGS=$(CFLAGS) $(DFLAGS) /MTd /LDd
-OBJPATH=ld
-!endif
-
-LIBS=$(PDPATH)\bin\pd.lib 
-
-!ifdef PTHREADS
-LIBS=$(LIBS) $(PTHREADS)\pthreadVC.lib 
-!else
-LIBS=$(LIBS) $(PDPATH)\bin\pthreadVC.lib 
-!endif
-
-!else
-
-EXT=lib
-
-!ifdef FLEXT_THREADS
-DEFS=$(DEFS) /DFLEXT_THREADS
-
-!ifndef _DEBUG
-CFLAGS=$(CFLAGS) $(OFLAGS) /MT
-OBJPATH=t
-!else
-CFLAGS=$(CFLAGS) $(DFLAGS) /MTd
-OBJPATH=td
-!endif
-
-!else
-
-!ifndef _DEBUG
-CFLAGS=$(CFLAGS) $(OFLAGS) /MT
-OBJPATH=s
-!else
-CFLAGS=$(CFLAGS) $(DFLAGS) /MTd
-OBJPATH=sd
-!endif
-
-!endif # FLEXT_THREADS
-
-!endif # FLEXT_SHARED
-
-
-# the rest can stay untouched
-# ----------------------------------------------
-
-# all the source files from the package
-!include make-files.txt
-
-!ifdef SNDOBJ
-SRCS=$(SRCS) $(SRCS_SNDOBJ)
-HDRS=$(HDRS) $(HDRS_SNDOBJ)
-INCPATH=$(INCPATH) /I$(SNDOBJ)\include
-LIBS=$(LIBS) $(SNDOBJ)\lib\sndobj.lib
-!endif
-
-!ifdef STK
-SRCS=$(SRCS) $(SRCS_STK)
-HDRS=$(HDRS) $(HDRS_STK)
-INCPATH=$(INCPATH) /I$(STK)\include
-LIBS=$(LIBS) $(STK)\lib\stk.lib
-!endif
-
-#default target
-all: $(OUTPATH)\$(NAME)-$(TARGET).$(EXT)
-
-# remove build
-clean:
-	-cd $(OUTPATH)
-	-del /s /q $(OBJPATH) > nul
-	-rmdir $(OBJPATH)
-	-cd ..
-	-del /q $(OUTPATH)\$(NAME)-$(TARGET).$(EXT) > nul
-	-rmdir $(OUTPATH)
-
-# -----------------------------------------------
-
-OBJS= $(SRCS:.cpp=.obj)
-
-{$(SOURCE)\}.cpp.obj:
-	@-if not exist $(OUTPATH) mkdir $(OUTPATH)
-	@cd $(OUTPATH)
-	@-if not exist $(OBJPATH) mkdir $(OBJPATH)
-	@cd ..
-	cl /c $(CFLAGS) $(DEFS) $(INCPATH) /Fo$(OUTPATH)\$(OBJPATH)\$(@F) $<
-
-
-$(OUTPATH)\$(NAME)-$(TARGET).lib: $(OBJS)
-	@cd $(OUTPATH)\$(OBJPATH)
-	lib /OUT:..\$(NAME)-$(TARGET).lib $(OBJS)
-	@cd ..\..
-!ifdef INSTDIR
-	@-if not exist $(OBJPATH) mkdir $(INSTDIR)
-	copy $(OUTPATH)\$(NAME)-$(TARGET).lib $(INSTDIR) > nul
-	copy $(SOURCE)\*.h $(INSTDIR) > nul
-!endif
-
-
-$(OUTPATH)\$(NAME)-$(TARGET).dll: $(OBJS)
-	@cd $(OUTPATH)\$(OBJPATH)
-	link /DLL /NOLOGO $(LDFLAGS) /OUT:..\$(NAME)-$(TARGET).dll $(LIBS) $(OBJS)
-	@cd ..\..
-!ifdef INSTDIR
-	@-if not exist $(OBJPATH) mkdir $(INSTDIR)
-	copy $(OUTPATH)\$(NAME)-$(TARGET).dll $(INSTDIR) > nul
-	copy $(SOURCE)\*.h $(INSTDIR) > nul
-!endif
-
diff --git a/externals/grill/flext/makefile.max-darwin b/externals/grill/flext/makefile.max-darwin
deleted file mode 100755
index a2fee930..00000000
--- a/externals/grill/flext/makefile.max-darwin
+++ /dev/null
@@ -1,148 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ darwin
-# 
-# usage:
-# to build run "make -f makefile.max-darwin"
-# to install (as root), do "make -f makefile.max-darwin install"
-#
-
-CONFIG=config-max-darwin.txt
-
-include ${CONFIG}
-
-# compiler+linker stuff 
-# the MaxMSP SDK path is directly inserted with the FLAGS below because it normally contains spaces...
-INCLUDES=    
-FLAGS=-I${MAXSDKPATH}/max-includes -I${MAXSDKPATH}/msp-includes -DFLEXT_SYS=1 ${UFLAGS}
-
-# compiler flags for optimized build
-CFLAGS=-O2 
-
-# compiler flags for debug build
-CFLAGS_D=-g
-
-# additional flags for threading
-CFLAGS_T=-DFLEXT_THREADS
-
-# additional flags for shared library
-CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
-
-# flags for shared linking
-LSHFLAGS= -dylib -dynamic -flat_namespace -undefined suppress
-
-# frameworks
-FRAMEWORKS=MaxAPI MaxAudioAPI
-
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=flext
-
-SRCDIR=./source
-
-# all the source files from the package
-include make-files.txt
-
-ifdef SNDOBJ
-INCLUDES+=$(SNDOBJ)
-SRCS+=$(SRCS_SNDOBJ)
-HDRS+=$(HDRS_SNDOBJ)
-endif
-
-ifdef STK
-INCLUDES+=$(STK)
-SRCS+=$(SRCS_STK)
-HDRS+=$(HDRS_STK)
-endif
-
-
-MAKEFILE=makefile.max-darwin
-
-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
-TARGET_S=$(TARGDIR)/lib$(NAME).dylib
-TARGET_SD=$(TARGDIR)/lib$(NAME)_d.dylib
-
-
-all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) #  $(TARGET_S) $(TARGET_SD)
-
-$(TARGDIR):
-	mkdir $(TARGDIR)
-
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst %,$(SRCDIR)/%,$(IHDRS)) $(MAKEFILE) $(CONFIG)
-	touch $@
-
-$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.to : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.so : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T)  $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp 
-	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T)  $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
-	libtool -static -o $@ $^
-
-$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) 
-	libtool -static -o $@ $^
-
-$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS))
-	libtool -static -o $@ $^
-
-$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
-	libtool -static -o $@ $^
-
-$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS))
-	ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) 
-
-$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
-	ld $(LSHFLAGS) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) 
-
-.PHONY: clean install
-
-clean:
-	rm -f $(TARGDIR)/*.{o,do,to,tdo,so,sdo} $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
-	
-ifdef INSTDIR
-$(INSTDIR):
-	-mkdir $(INSTDIR)
-
-install:: $(INSTDIR)
-endif
-
-install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD) $(patsubst %,$(SRCDIR)/%,$(HDRS)) 
-	cp $^ $(INSTDIR)
-	mv $(INSTDIR)/lib*.dylib /usr/local/lib
-	ranlib $(INSTDIR)/*.a  # have to rerun ranlib at install dir ?!
-	
-	#make compatibility links for old-style naming
-	for i in $(foreach f,$(notdir $(filter %.a,$^)),$(patsubst lib%.a,%,$(f))); do rm -f $(INSTDIR)/$$i.a && ln -sf lib$$i.a $(INSTDIR)/$$i.a; done 
-
-#	chmod 755 $(patsubst %,$(INSTDIR)/%,$(notdir $^))
-#	chgrp admin $(patsubst %,$(INSTDIR)/%,$(notdir $^))
-
-
-
-
-
-
-
-
-
-
diff --git a/externals/grill/flext/makefile.max-msvc b/externals/grill/flext/makefile.max-msvc
deleted file mode 100644
index f170f23d..00000000
--- a/externals/grill/flext/makefile.max-msvc
+++ /dev/null
@@ -1,37 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for MSVC++
-#
-#
-# IMPORTANT: Adjust some of the paths also in makefile-inc.msvc
-#
-# usage: make -f makefile.max-msvc
-#
-# ---------------------------------------------------------------
-
-!include config-max-msvc.txt
-
-all: flext flext_t flext_d flext_td # flext_s flext_sd
-
-flext:
-	nmake /f make-inc.max-msvc  NAME=$* 
-
-flext_d:
-	nmake /f make-inc.max-msvc  NAME=$* _DEBUG=1
-
-flext_t:
-	nmake /f make-inc.max-msvc  NAME=$* FLEXT_THREADS=1
-
-flext_td:
-	nmake /f make-inc.max-msvc  NAME=$* FLEXT_THREADS=1 _DEBUG=1
-
-flext_s:
-	nmake /f make-inc.max-msvc  NAME=flext FLEXT_SHARED=1
-
-flext_sd:
-	nmake /f make-inc.max-msvc  NAME=flext_d FLEXT_SHARED=1 _DEBUG=1
-
-
-clean:
-	nmake /f make-inc.max-msvc  clean
diff --git a/externals/grill/flext/makefile.pd-bcc b/externals/grill/flext/makefile.pd-bcc
deleted file mode 100644
index 5bb5af62..00000000
--- a/externals/grill/flext/makefile.pd-bcc
+++ /dev/null
@@ -1,29 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (gr@grrrr.org)
-#
-# Makefile for BCC++
-#
-#
-# IMPORTANT: Adjust some of the paths also in makefile-inc.bcc
-#
-# usage: make -f makefile.pd-bcc
-#
-# ---------------------------------------------------------------
-
-all: flext flext_t flext_d flext_td
-
-flext:
-	make /f make-inc.pd-bcc  NAME=$* 
-
-flext_d:
-	make /f make-inc.pd-bcc  NAME=$* DEBUG=1
-
-flext_t:
-	make /f make-inc.pd-bcc  NAME=$* THREADED=1
-
-flext_td:
-	make /f make-inc.pd-bcc  NAME=$* THREADED=1 DEBUG=1
-
-
-clean:
-	make /f make-inc.pd-bcc  clean
diff --git a/externals/grill/flext/makefile.pd-cygwin b/externals/grill/flext/makefile.pd-cygwin
deleted file mode 100644
index 8c81f45a..00000000
--- a/externals/grill/flext/makefile.pd-cygwin
+++ /dev/null
@@ -1,130 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ cygwin
-#
-# usage:
-# to build run "make -f makefile.pd-cygwin"
-#
-# -----------------------------------------------------------
-
-
-CONFIG=config-pd-cygwin.txt
-MAKEFILE=makefile.pd-cygwin
-
-include $(CONFIG)
-
-
-# compiler+linker stuff
-# /usr/include before the PD path is necessary to include the right pthread files!
-INCLUDES=/usr/include $(PDPATH)/src  
-
-FLAGS=-DFLEXT_SYS=2 $(UFLAGS)
-CFLAGS=-O2
-CFLAGS_D=-DFLEXT_DEBUG -g
-CFLAGS_T=-DFLEXT_THREADS
-CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
-
-PDLIBS=$(PDPATH)/bin/pd.dll $(PDPATH)/bin/pthreadVC.dll
-
-INSTDIR=$(PDPATH)/flext
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=flext
-SRCDIR=source
-
-# all the source files from the package
-include make-files.txt
-
-ifdef SNDOBJ
-INCLUDES+=$(SNDOBJ)
-SRCS+=$(SRCS_SNDOBJ)
-HDRS+=$(HDRS_SNDOBJ)
-endif
-
-ifdef STK
-INCLUDES+=$(STK)
-SRCS+=$(SRCS_STK)
-HDRS+=$(HDRS_STK)
-endif
-
-
-TARGET=$(TARGDIR)/$(NAME)-pdwin.a
-TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.a
-TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.a
-TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.a
-TARGET_S=$(TARGDIR)/$(NAME).dll
-TARGET_SD=$(TARGDIR)/$(NAME)_d.dll
-
-TARGETS=$(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
-
-
-all: $(TARGDIR) $(TARGETS)
-
-$(TARGDIR):
-	-mkdir $(TARGDIR)
-
-$(SRCS): $(HDRS) $(IHDRS) $(MAKEFILE) $(CONFIG)
-	touch $@
-
-$(TARGDIR)/%.ro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.tro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.sro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS))
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS))
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS))
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS))
-	$(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
-	strip --strip-unneeded $@
-	chmod 755 $@
-
-$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
-	$(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
-	chmod 755 $@
-
-
-.PHONY: clean install
-clean:
-	rm -f $(TARGDIR)/*.o $(TARGETS)
-	
-ifdef INSTDIR
-$(INSTDIR):
-	-mkdir $(INSTDIR)
-
-install:: $(INSTDIR)
-endif
-
-install:: $(TARGETS) $(patsubst %,$(SRCDIR)/%,$(HDRS)) 
-	cp $^ $(INSTDIR)
diff --git a/externals/grill/flext/makefile.pd-darwin b/externals/grill/flext/makefile.pd-darwin
deleted file mode 100644
index 7accda82..00000000
--- a/externals/grill/flext/makefile.pd-darwin
+++ /dev/null
@@ -1,152 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ darwin
-# 
-# usage:
-# to build run "make -f makefile.pd-darwin"
-# to install (as root), do "make -f makefile.pd-darwin install"
-#
-
-CONFIG=config-pd-darwin.txt
-
-include ${CONFIG}
-
-# compiler+linker stuff 
-INCLUDES=${PDPATH}
-FLAGS=-DFLEXT_SYS=2 ${UFLAGS}
-
-# compiler flags for optimized build
-CFLAGS=-O2
-
-# compiler flags for debug build
-CFLAGS_D=-g
-
-# additional flags for threading
-CFLAGS_T=-DFLEXT_THREADS
-
-# additional flags for shared library
-CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
-
-# flags for shared linking
-LSHFLAGS= -dylib -dynamic -flat_namespace -undefined suppress
-
-ifdef $(INSTDIR)
-LSHFLAGS_R=-dylib_install_name $(INSTDIR)/libflext.dylib
-LSHFLAGS_D=-dylib_install_name $(INSTDIR)/libflext_d.dylib
-endif
-
-# frameworks
-#FRAMEWORKS=Carbon veclib
-
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=flext
-
-SRCDIR=./source
-
-# all the source files from the package
-include make-files.txt
-
-ifdef SNDOBJ
-INCLUDES+=$(SNDOBJ)
-SRCS+=$(SRCS_SNDOBJ)
-HDRS+=$(HDRS_SNDOBJ)
-endif
-
-ifdef STK
-INCLUDES+=$(STK)
-SRCS+=$(SRCS_STK)
-HDRS+=$(HDRS_STK)
-endif
-
-
-MAKEFILE=#makefile.pd-darwin
-
-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
-TARGET_S=$(TARGDIR)/lib$(NAME).dylib
-TARGET_SD=$(TARGDIR)/lib$(NAME)_d.dylib
-
-
-all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD)   $(TARGET_S) $(TARGET_SD)
-
-$(TARGDIR):
-	mkdir $(TARGDIR)
-
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst %,$(SRCDIR)/%,$(IHDRS)) $(MAKEFILE) $(CONFIG)
-	touch $@
-
-$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.to : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.so : $(SRCDIR)/%.cpp
-	$(CXX) -c -dynamic $(CFLAGS) $(CFLAGS_T)  $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp 
-	$(CXX) -c -dynamic $(CFLAGS_D) $(CFLAGS_T)  $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $(patsubst %,-F%,$(FRAMEWORKS)) $< -o $@
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
-	libtool -static -o $@ $^
-
-$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) 
-	libtool -static -o $@ $^
-
-$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS))
-	libtool -static -o $@ $^
-
-$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
-	libtool -static -o $@ $^
-
-$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS))
-	ld $(LSHFLAGS) $(LSHFLAGS_R) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) 
-
-$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
-	ld $(LSHFLAGS) $(LSHFLAGS_D) -o $@ $^ -ldylib1.o -lgcc -lstdc++ $(patsubst %,-framework %,$(FRAMEWORKS)) 
-
-.PHONY: clean install
-
-clean:
-	rm -f $(TARGDIR)/*.{o,do,to,tdo,so,sdo} $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
-	
-ifdef INSTDIR
-$(INSTDIR):
-	-mkdir $(INSTDIR)
-
-install:: $(INSTDIR)
-endif
-
-install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD) $(patsubst %,$(SRCDIR)/%,$(HDRS)) 
-	cp $^ $(INSTDIR)
-	mv $(INSTDIR)/lib*.dylib /usr/local/lib
-	ranlib $(INSTDIR)/*.a  # have to rerun ranlib at install dir ?!
-	
-	#make compatibility links for old-style naming
-	for i in $(foreach f,$(notdir $(filter %.a,$^)),$(patsubst lib%.a,%,$(f))); do rm -f $(INSTDIR)/$$i.a && ln -sf lib$$i.a $(INSTDIR)/$$i.a; done 
-
-#	chmod 755 $(patsubst %,$(INSTDIR)/%,$(notdir $^))
-#	chgrp admin $(patsubst %,$(INSTDIR)/%,$(notdir $^))
-
-
-
-
-
-
-
-
-
-
diff --git a/externals/grill/flext/makefile.pd-linux b/externals/grill/flext/makefile.pd-linux
deleted file mode 100644
index 70567c97..00000000
--- a/externals/grill/flext/makefile.pd-linux
+++ /dev/null
@@ -1,153 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ linux
-#
-# usage:
-# to build run "make -f makefile.pd-linux"
-# to install (as root), do "make -f makefile.pd-linux install"
-#
-
-CONFIG=config-pd-linux.txt
-
-include ${CONFIG}
-
-# compiler+linker stuff 
-INCLUDES=${PDPATH}
-
-# general compiler flags
-FLAGS=-DFLEXT_SYS=2 -fPIC ${UFLAGS}
-
-# compiler flags for optimized build
-CFLAGS=-O2
-
-# compiler flags for debug build
-CFLAGS_D=-g -DFLEXT_DEBUG 
-
-# additional flags for threading
-CFLAGS_T=-DFLEXT_THREADS  
-
-# additional flags for shared library
-CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
-
-# libraries
-# it seems like libstdc++ must be defined for icc....
-# LIBS=stdc++
-# but it seems that's only true for older icc versions....
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=flext
-SRCDIR=./source
-
-# all the source files from the package
-include make-files.txt
-
-ifdef SNDOBJ
-INCLUDES+=${SNDOBJ}
-SRCS+=${SRCS_SNDOBJ}
-HDRS+=${HDRS_SNDOBJ}
-LIBS+=sndobj
-endif
-
-ifdef STK
-INCLUDES+=${STK}
-SRCS+=${SRCS_STK}
-HDRS+=${HDRS_STK}
-LIBS+=stk
-endif
-
-MAKEFILE=makefile.pd-linux
-
-# invoke dynamic linking
-ifeq ($(CXX),icc)
-DYNAMIC=-i_dynamic
-else
-DYNAMIC=-Wl,-Bdynamic
-endif
-
-
-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
-TARGET_S=${TARGDIR}/lib${NAME}.so
-TARGET_SD=${TARGDIR}/lib${NAME}_d.so
-
-
-all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
-
-$(TARGDIR):
-	mkdir $(TARGDIR)
-
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst %,$(SRCDIR)/%,$(IHDRS)) $(MAKEFILE) $(CONFIG)
-	touch $@
-
-$(TARGDIR)/%.ro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.tro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.sro : $(SRCDIR)/%.cpp
-	$(CXX) -shared -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp
-	$(CXX) -shared -c $(CFLAGS_D) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-
-
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) 
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) 
-	$(AR) rc $@ $^ 
-	chmod 644 $@
-
-$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS))
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS))
-	$(CXX) -shared $(DYNAMIC) -Wl,--strip-debug $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(patsubst %,-l%,$(LIBS)) 
-	chmod 755 $@
-
-$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
-	$(CXX) -shared $(DYNAMIC) $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(patsubst %,-l%,$(LIBS)) 
-	chmod 755 $@
-
-
-.PHONY: clean install
-
-clean:
-	rm -f $(TARGDIR)/*.{ro,do,tro,tdo,sro,sdo} $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
-	
-ifdef INSTDIR
-$(INSTDIR):
-	-mkdir $(INSTDIR)
-
-install:: $(INSTDIR)
-endif
-
-install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)  $(patsubst %,$(SRCDIR)/%,$(HDRS))
-	cp $^ $(INSTDIR)
-
-	#make compatibility links for old-style naming
-	for i in $(foreach f,$(notdir $(filter %.a,$^)),$(patsubst lib%.a,%,$(f))); do rm -f $(INSTDIR)/$$i.a && ln -sf lib$$i.a $(INSTDIR)/$$i.a; done 
-
-	chmod a+r $(patsubst %,$(INSTDIR)/%,$(notdir $^))
-	chown root.users $(patsubst %,$(INSTDIR)/%,$(notdir $^))
diff --git a/externals/grill/flext/makefile.pd-mingw b/externals/grill/flext/makefile.pd-mingw
deleted file mode 100644
index 06a7e1c7..00000000
--- a/externals/grill/flext/makefile.pd-mingw
+++ /dev/null
@@ -1,130 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ mingw
-#
-# usage:
-# to build run "make -f makefile.pd-mingw"
-#
-# ---------------------------------------------
-
-
-CONFIG=config-pd-mingw.txt
-MAKEFILE=makefile.pd-mingw
-
-include $(CONFIG)
-
-
-# compiler+linker stuff
-INCLUDES=$(PDPATH)/src  
-
-FLAGS=-DFLEXT_SYS=2 $(UFLAGS)
-CFLAGS=-O2
-CFLAGS_D=-DFLEXT_DEBUG -g
-CFLAGS_T=-DFLEXT_THREADS
-CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
-
-PDLIBS=$(PDPATH)/bin/pd.dll $(PDPATH)/bin/pthreadVC.dll
-
-INSTDIR=$(PDPATH)/flext
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=flext
-SRCDIR=source
-
-# all the source files from the package
-include make-files.txt
-
-ifdef SNDOBJ
-INCLUDES+=$(SNDOBJ)
-SRCS+=$(SRCS_SNDOBJ)
-HDRS+=$(HDRS_SNDOBJ)
-endif
-
-ifdef STK
-INCLUDES+=$(STK)
-SRCS+=$(SRCS_STK)
-HDRS+=$(HDRS_STK)
-endif
-
-
-TARGET=$(TARGDIR)/$(NAME)-pdwin.lib
-TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib
-TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.lib
-TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.lib
-TARGET_S=$(TARGDIR)/$(NAME).dll
-TARGET_SD=$(TARGDIR)/$(NAME)_d.dll
-
-TARGETS=$(TARGET) $(TARGET_D) # $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
-
-
-all: $(TARGDIR) $(TARGETS)
-
-$(TARGDIR):
-	-mkdir $(TARGDIR)
-
-$(SRCS): $(HDRS) $(IHDRS) $(MAKEFILE) $(CONFIG)
-#	echo touch $@  # minGW has no touch
-
-$(TARGDIR)/%.ro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.tro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.sro : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-$(TARGDIR)/%.sdo : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS_D) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS))
-	$(AR) rc $@ $^
-#	chmod 644 $@
-
-$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS))
-	$(AR) rc $@ $^
-#	chmod 644 $@
-
-$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS))
-	$(AR) rc $@ $^
-	chmod 644 $@
-
-$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
-	$(AR) rc $@ $^
-#	chmod 644 $@
-
-$(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS))
-	$(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
-	strip --strip-unneeded $@
-#	chmod 755 $@
-
-$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
-	$(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
-#	chmod 755 $@
-
-
-.PHONY: clean install
-clean:
-	del -f $(TARGDIR)\*.o $(TARGETS)
-	
-ifdef INSTDIR
-$(INSTDIR):
-	-mkdir $(INSTDIR)
-
-install:: $(INSTDIR)
-endif
-
-install:: $(TARGETS) $(patsubst %,$(SRCDIR)/%,$(HDRS)) 
-	for %%i in ($(subst /,\,$^)) do copy %%i $(subst /,\,$(INSTDIR)) > nul
-
diff --git a/externals/grill/flext/makefile.pd-msvc b/externals/grill/flext/makefile.pd-msvc
deleted file mode 100644
index 45f24a85..00000000
--- a/externals/grill/flext/makefile.pd-msvc
+++ /dev/null
@@ -1,37 +0,0 @@
-# flext - C++ layer for Max/MSP and pd (pure data) externals
-# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for MSVC++
-#
-#
-# IMPORTANT: Adjust some of the paths also in makefile-inc.msvc
-#
-# usage: make -f makefile.pd-msvc
-#
-# ---------------------------------------------------------------
-
-!include config-pd-msvc.txt
-
-all: flext flext_t flext_d flext_td # flext_s flext_sd
-
-flext:
-	nmake /f make-inc.pd-msvc  NAME=$* 
-
-flext_d:
-	nmake /f make-inc.pd-msvc  NAME=$* _DEBUG=1
-
-flext_t:
-	nmake /f make-inc.pd-msvc  NAME=$* FLEXT_THREADS=1
-
-flext_td:
-	nmake /f make-inc.pd-msvc  NAME=$* FLEXT_THREADS=1 _DEBUG=1
-
-flext_s:
-	nmake /f make-inc.pd-msvc  NAME=flext FLEXT_SHARED=1
-
-flext_sd:
-	nmake /f make-inc.pd-msvc  NAME=flext_d FLEXT_SHARED=1 _DEBUG=1
-
-
-clean:
-	nmake /f make-inc.pd-msvc  clean
diff --git a/externals/grill/flext/package.txt b/externals/grill/flext/package.txt
index 2c85f8cf..826b085b 100644
--- a/externals/grill/flext/package.txt
+++ b/externals/grill/flext/package.txt
@@ -3,8 +3,10 @@ NAME=flext
 BUILDCLASS=flext
 BUILDMODE=all
 BUILDTYPE=all
-
-SRCDIR=source
+
+SRCDIR=source
+
+PRECOMPILE=flext.h
 
 SRCS= \
 	flbase.cpp flext.cpp flbuf.cpp fldsp.cpp fllib.cpp \
diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h
index 0a63111e..14e4f0f0 100644
--- a/externals/grill/flext/source/flstdc.h
+++ b/externals/grill/flext/source/flstdc.h
@@ -118,7 +118,10 @@ extern "C" {
 
 #include "ext.h"
 #include "ext_user.h"
+#if FLEXT_OS == FLEXT_OS_MAC && defined(MAC_VERSION)
+// doesn't exist for OS9
 #include "ext_critical.h"
+#endif
 #include "z_dsp.h"
 
 } // extern "C"
@@ -133,10 +136,9 @@ typedef t_int t_flint;
 typedef t_symbol *t_symtype;
 typedef t_object *t_thing;
 
-// for the following to work for Max for OSX you should have the latest SDK
-#if FLEXT_OS == FLEXT_OS_MAC && !defined(MAC_VERSION)
-// Max for OS9 SDK
-typedef qelem t_qelem;
+// for the following to work you should have the latest SDK
+#if FLEXT_OS == FLEXT_OS_MAC //&& !defined(MAC_VERSION)
+typedef struct qelem t_qelem;
 #else
 typedef void *t_qelem;
 #endif
@@ -170,6 +172,11 @@ typedef void t_binbuf;
 #define A_DEFSYMBOL A_DEFSYM
 #endif
 
+#if FLEXT_OS == FLEXT_OS_MAC && !defined(MAC_VERSION)
+// simulate non-existing functions for OS9
+#define critical_enter(N)
+#define critical_exit(N)
+#endif
 
 #elif FLEXT_SYS == FLEXT_SYS_JMAX
author	Thomas Grill <xovo@users.sourceforge.net>	2005-01-04 04:58:53 +0000
committer	Thomas Grill <xovo@users.sourceforge.net>	2005-01-04 04:58:53 +0000
commit	7d237bf606940cede753ae1c07a59c1ec24027bf (patch)
tree	4366a0c71e09acb4e89556964d4e23f6e3fe7631
parent	71b359c9eeb0071f6a1dfa2befb07a619b1e75c4 (diff)