6 files changed, 397 insertions, 222 deletions
diff --git a/externals/grill/vst/build-pd-darwin.sh b/externals/grill/vst/build-pd-darwin.sh
index f983f8c5..826954b1 100644
--- a/externals/grill/vst/build-pd-darwin.sh
+++ b/externals/grill/vst/build-pd-darwin.sh
@@ -1,11 +1,11 @@
-#!/bin/sh  
-
-. config-pd-darwin.txt
-
-make -f makefile.pd-darwin &&
-{ 
-	if [ $INSTPATH != "" ]; then
-		echo Now install as root
-		sudo make -f makefile.pd-darwin install
-	fi
-}
+#!/bin/sh  
+
+. config-pd-darwin.txt
+
+make -f makefile.pd-darwin &&
+{ 
+	if [ "${INSTPATH}" != "" ]; then
+		echo Now install as root
+		sudo make -f makefile.pd-darwin install
+	fi 
+}
diff --git a/externals/grill/vst/config-pd-darwin.txt b/externals/grill/vst/config-pd-darwin.txt
index 24a5b376..4451914c 100644
--- a/externals/grill/vst/config-pd-darwin.txt
+++ b/externals/grill/vst/config-pd-darwin.txt
@@ -1,33 +1,35 @@
-# FFTease - A set of Live Spectral Processors
-# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform
-# 
-# Copyright (c)Thomas Grill (xovo@gmx.net)
-# For information on usage and redistribution, and for a DISCLAIMER OF ALL
-# WARRANTIES, see the file, "license.txt," in this distribution.  
-#
-
-# your c/c++ compilers (define only if not gcc/g++)
-# C=gcc
-# CXX=g++
-
-# where are the PD header files?
-# leave it blank if it is a system directory (like /usr/local/include), 
-# 	since gcc 3.2 complains about it
-PDPATH=/usr/local/pd/src
-
-# where is the PD executable?
-PD=/usr/local/pd/bin/pd
-
-# where do the flext libraries reside?
-FLEXTPATH=/usr/local/pd/flext
-
-
-# where should flext libraries be built?
-TARGDIR=./pd-darwin
-# where should the external be installed?
-# (leave blank to omit installation)
-INSTPATH=/usr/local/pd/extra
-
-# additional compiler flags
-# (check if they fit for your system!)
-# UFLAGS=-maltivec
+# vst~ - VST plugin external for PD
+# based on the work of Jarno SeppŠnen and Mark Williamson
+# 
+# Copyright (c)Thomas Grill (xovo@gmx.net)
+# For information on usage and redistribution, and for a DISCLAIMER OF ALL
+# WARRANTIES, see the file, "license.txt," in this distribution.  
+#
+ 
+# your c++ compiler (define only if not g++)
+# CXX=g++
+
+# where is PD installed?
+PDDIR=/usr/local/pd
+
+# where are the PD header files?
+# leave it blank if it is a system directory (like /usr/local/include), 
+# 	since gcc 3.2 complains about it
+PDPATH=${PDDIR}/src
+
+# where is the PD executable?
+PD=${PDDIR}/bin/pd
+
+# where do the flext libraries reside?
+FLEXTPATH=${PDDIR}/flext
+
+
+# where should flext libraries be built?
+TARGDIR=./pd-darwin
+# where should the external be installed?
+# (leave blank to omit installation)
+INSTPATH=${PDDIR}/extra
+
+# additional compiler flags
+# (check if they fit for your system!)
+UFLAGS=-malign-power -maltivec
diff --git a/externals/grill/vst/config-pd-msvc.txt b/externals/grill/vst/config-pd-msvc.txt
index 83115226..1cb31aab 100644
--- a/externals/grill/vst/config-pd-msvc.txt
+++ b/externals/grill/vst/config-pd-msvc.txt
@@ -1,25 +1,50 @@
-# FFTease - A set of Live Spectral Processors
-# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform
-# 
-# Copyright (c)Thomas Grill (xovo@gmx.net)
-# For information on usage and redistribution, and for a DISCLAIMER OF ALL
-# WARRANTIES, see the file, "license.txt," in this distribution.  
-#
-
-
-# where is PD?
-PDPATH=c:\programme\audio\pd		
-
-# where do the flext libraries reside?
-FLEXTPATH=$(PDPATH)\flext
-
-# where is MS VC++?
-MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
-
-
-# where should the external be built?
-OUTPATH=pd-msvc
-
-# where should the external be installed?
-# (leave blank to omit installation)
-INSTDIR=$(PDPATH)\extra
+# vst~ - VST plugin external for PD
+
+# based on the work of Jarno SeppŠnen and Mark Williamson
+
+#
+
+# Copyright (c)Thomas Grill (xovo@gmx.net)
+
+# For information on usage and redistribution, and for a DISCLAIMER OF ALL
+
+# WARRANTIES, see the file, "license.txt," in this distribution.  
+
+#
+
+
+
+
+
+# where is PD?
+
+PDPATH=c:\programme\audio\pd		
+
+
+
+# where do the flext libraries reside?
+
+FLEXTPATH=$(PDPATH)\flext
+
+
+
+# where is MS VC++?
+
+MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
+
+
+
+
+
+# where should the external be built?
+
+OUTPATH=pd-msvc
+
+
+
+# where should the external be installed?
+
+# (leave blank to omit installation)
+
+INSTDIR=$(PDPATH)\extra
+
diff --git a/externals/grill/vst/make-files.txt b/externals/grill/vst/make-files.txt
index 31a51078..67823ba6 100644
--- a/externals/grill/vst/make-files.txt
+++ b/externals/grill/vst/make-files.txt
@@ -1,7 +1,7 @@
-# all the source files from the package
-SRCS= \
-	main.cpp
-              
-HDRS= \
-	main.h vst~.h 
-
+# all the source files from the package
+SRCS= main.cpp
+SRCS_WIN=EditorThread.cpp PopupWindow.cpp VstHost.cpp StdAfx.cpp
+              
+HDRS= \
+	main.h vst.h 
+
diff --git a/externals/grill/vst/makefile.pd-darwin b/externals/grill/vst/makefile.pd-darwin
index 7872e3d8..d497406b 100644
--- a/externals/grill/vst/makefile.pd-darwin
+++ b/externals/grill/vst/makefile.pd-darwin
@@ -1,78 +1,156 @@
-# FFTease - A set of Live Spectral Processors
-# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform
-# 
-# Copyright (c)Thomas Grill (xovo@gmx.net)
-# For information on usage and redistribution, and for a DISCLAIMER OF ALL
-# WARRANTIES, see the file, "license.txt," in this distribution.  
-#
-#
-# Makefile for gcc @ darwin (OSX)
-#
-# 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}
-
-FLEXTLIB=${FLEXTPATH}/flext.a
-
-# compiler+linker stuff	
-INCLUDES=${PDPATH} ${FLEXTPATH} 
-LIBPATH= 
-FLAGS=-DFLEXT_SYS=2 ${UFLAGS}
-CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-exceptions -fno-rtti
-#CFLAGS=-g
-LIBS=m 
-LDFLAGS=-bundle -bundle_loader ${PD}
-
-# ---------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-NAME=fftease
-
-# all the source files from the package
-include make-files.txt
-
-DIR=src
-
-TARGET=$(TARGDIR)/$(NAME).pd_darwin
-MAKEFILE=makefile.pd-darwin
-
-# default target
-all: $(TARGDIR) $(TARGET)
-
-$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(CONFIG)
-	touch $@
-
-$(TARGDIR):
-	mkdir $(TARGDIR)
-
-$(TARGDIR)/%.o : $(DIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@
-
-$(TARGDIR)/%.co : $(DIR)/%.c
-	$(CC) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@
-
-$(TARGET) : $(patsubst %.c,$(TARGDIR)/%.co,$(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))) $(FLEXTLIB) 
-	$(CXX) $(LDFLAGS) $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
-	chmod 755 $@
-
-$(INSTPATH):
-	mkdir $(INSTPATH)
-
-install:: $(INSTPATH)
-
-install:: $(TARGET)
-	cp $^ $(INSTPATH)
-#	chown root.root  $(patsubst %,$(INSTPATH)/%,$(notdir $^))
-#	chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^))
-
-.PHONY: clean
-
-clean:
-	rm -f $(TARGDIR)/*.o $(TARGET)
-	
-
+# vst~ - VST plugin external for PD
+
+# based on the work of Jarno SeppŠnen and Mark Williamson
+
+# 
+
+# Copyright (c)Thomas Grill (xovo@gmx.net)
+
+# For information on usage and redistribution, and for a DISCLAIMER OF ALL
+
+# WARRANTIES, see the file, "license.txt," in this distribution.  
+
+#
+
+#
+
+# Makefile for gcc @ darwin (OSX)
+
+#
+
+# 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}
+
+
+
+FLEXTLIB=${FLEXTPATH}/flext.a
+
+
+
+# compiler+linker stuff	
+
+INCLUDES=${PDPATH} ${FLEXTPATH} 
+
+LIBPATH= 
+
+FLAGS=-DFLEXT_SYS=2 ${UFLAGS}
+
+CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-exceptions -fno-rtti
+
+LIBS=m 
+
+LDFLAGS=-bundle -bundle_loader ${PD}
+
+FRAMEWORKS=Carbon
+
+
+
+# ---------------------------------------------
+
+# the rest can stay untouched
+
+# ----------------------------------------------
+
+NAME=vst~
+
+
+
+# all the source files from the package
+
+include make-files.txt
+
+
+
+DIR=src
+
+
+
+TARGET=$(TARGDIR)/$(NAME).pd_darwin
+
+MAKEFILE=makefile.pd-darwin
+
+
+
+# default target
+
+all: $(TARGDIR) $(TARGET)
+
+
+
+$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(CONFIG)
+
+	touch $@
+
+
+
+$(TARGDIR):
+
+	mkdir $(TARGDIR)
+
+
+
+$(TARGDIR)/%.o : $(DIR)/%.cpp
+
+	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@
+
+
+
+$(TARGDIR)/%.co : $(DIR)/%.c
+
+	$(CC) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@
+
+
+
+$(TARGET) : $(patsubst %.c,$(TARGDIR)/%.co,$(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))) $(FLEXTLIB) 
+
+	$(CXX) $(LDFLAGS) $^ $(patsubst %,-framework%,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
+
+	chmod 755 $@
+
+
+
+$(INSTPATH):
+
+	mkdir $(INSTPATH)
+
+
+
+install:: $(INSTPATH)
+
+
+
+install:: $(TARGET)
+
+	cp $^ $(INSTPATH)
+
+#	chown root.root  $(patsubst %,$(INSTPATH)/%,$(notdir $^))
+
+#	chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^))
+
+
+
+.PHONY: clean
+
+
+
+clean:
+
+	rm -f $(TARGDIR)/*.o $(TARGET)
+
+	
+
+
+
diff --git a/externals/grill/vst/makefile.pd-msvc b/externals/grill/vst/makefile.pd-msvc
index 97ffa4a8..9d98c368 100644
--- a/externals/grill/vst/makefile.pd-msvc
+++ b/externals/grill/vst/makefile.pd-msvc
@@ -1,68 +1,138 @@
-# FFTease - A set of Live Spectral Processors
-# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform
-# 
-# Copyright (c)Thomas Grill (xovo@gmx.net)
-# For information on usage and redistribution, and for a DISCLAIMER OF ALL
-# WARRANTIES, see the file, "license.txt," in this distribution.  
-#
-#
-# Makefile for MSVC++ 6
-#
-# usage:
-# to build run "make -f makefile.pd-msvc"
-#
-
-!include config-pd-msvc.txt
-
-# includes
-INCPATH=/I"$(MSVCPATH)\include" /I"$(PDPATH)\src" /I"$(FLEXTPATH)"
-LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)"
-LIBS=pd.lib flext-pdwin.lib 
-
-# compiler definitions and flags
-DEFS=/DPD 
-
-CFLAGS=/GR- /GX- /GD /G6 /Ox 
-
-# the rest can stay untouched
-# ----------------------------------------------
-
-# all the source files from the package
-!include make-files.txt
-
-# -----------------------------------------------
-
-NAME=fftease
-DIR=src
-
-all: $(OUTPATH) $(OUTPATH)\$(NAME).dll
-
-# remove build
-clean:
-	-del /q $(OUTPATH) > nul
-	-rmdir $(OUTPATH) > nul
-
-OBJS= $(SRCS:.c=.obj)
-OBJS= $(OBJS:.objpp=.obj)
-
-
-$(OUTPATH):
-	-mkdir $(OUTPATH) > nul
-
-{$(DIR)}.cpp{}.obj:
-	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@
-
-{$(DIR)}.c{}.obj:
-	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@
-
-
-$(OUTPATH)\$(NAME).dll: $(OBJS)
-	cd $(OUTPATH)
-	link /DLL /out:$(NAME).dll /INCREMENTAL:NO $** $(LIBS) $(LIBPATH)
-	@-del *.exp
-	@-del *.lib
-	cd ..
-!ifdef INSTPATH
-	@-if not exist $(INSTPATH) mkdir $(INSTPATH)
-	copy $@ $(INSTPATH) > nul
-!endif
+# FFTease - A set of Live Spectral Processors
+
+# Originally written by Eric Lyon and Christopher Penrose for the Max/MSP platform
+
+# 
+
+# Copyright (c)Thomas Grill (xovo@gmx.net)
+
+# For information on usage and redistribution, and for a DISCLAIMER OF ALL
+
+# WARRANTIES, see the file, "license.txt," in this distribution.  
+
+#
+
+#
+
+# Makefile for MSVC++ 6
+
+#
+
+# usage:
+
+# to build run "make -f makefile.pd-msvc"
+
+#
+
+
+
+!include config-pd-msvc.txt
+
+
+
+# includes
+
+INCPATH=/I"$(MSVCPATH)\include" /I"$(PDPATH)\src" /I"$(FLEXTPATH)"
+
+LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)"
+
+LIBS=pd.lib flext-pdwin.lib 
+
+
+
+# compiler definitions and flags
+
+DEFS=/DPD 
+
+
+
+CFLAGS=/GR- /GX- /GD /G6 /Ox 
+
+
+
+# the rest can stay untouched
+
+# ----------------------------------------------
+
+
+
+# all the source files from the package
+
+!include make-files.txt
+
+SRCS=SRCS+SRCS_WIN
+
+
+
+# -----------------------------------------------
+
+
+
+NAME=vst~
+
+DIR=src
+
+
+
+all: $(OUTPATH) $(OUTPATH)\$(NAME).dll
+
+
+
+# remove build
+
+clean:
+
+	-del /q $(OUTPATH) > nul
+
+	-rmdir $(OUTPATH) > nul
+
+
+
+OBJS= $(SRCS:.c=.obj)
+
+OBJS= $(OBJS:.objpp=.obj)
+
+
+
+
+
+$(OUTPATH):
+
+	-mkdir $(OUTPATH) > nul
+
+
+
+{$(DIR)}.cpp{}.obj:
+
+	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@
+
+
+
+{$(DIR)}.c{}.obj:
+
+	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@
+
+
+
+
+
+$(OUTPATH)\$(NAME).dll: $(OBJS)
+
+	cd $(OUTPATH)
+
+	link /DLL /out:$(NAME).dll /INCREMENTAL:NO $** $(LIBS) $(LIBPATH)
+
+	@-del *.exp
+
+	@-del *.lib
+
+	cd ..
+
+!ifdef INSTPATH
+
+	@-if not exist $(INSTPATH) mkdir $(INSTPATH)
+
+	copy $@ $(INSTPATH) > nul
+
+!endif
+