""

svn path=/trunk/; revision=477

2 files changed, 8 insertions, 154 deletions

diff --git a/externals/grill/vst/makefile.pd-darwin b/externals/grill/vst/makefile.pd-darwin
index d497406b..c35e624a 100644
--- a/externals/grill/vst/makefile.pd-darwin
+++ b/externals/grill/vst/makefile.pd-darwin
@@ -1,156 +1,78 @@
 # 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
-
-
+SRCS+=${SRCS_MAC}
 
 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)
-
-	
-
-
-
+	
\ No newline at end of file
diff --git a/externals/grill/vst/makefile.pd-msvc b/externals/grill/vst/makefile.pd-msvc
index 9d98c368..eee2a478 100644
--- a/externals/grill/vst/makefile.pd-msvc
+++ b/externals/grill/vst/makefile.pd-msvc
@@ -1,138 +1,70 @@
 # 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 
-
-
+INCPATH=/I"$(MSVCPATH)\include" /I"$(MSVCPATH)\mfc\include" /I"$(PDPATH)\src" /I"$(FLEXTPATH)"
+LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(MSVCPATH)\mfc\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)"
+LIBS=pd.lib pthreadVC.lib flext_t-pdwin.lib 
 
 # compiler definitions and flags
+DEFS=/DFLEXT_SYS=2 /DFLEXT_THREADS
 
-DEFS=/DPD 
-
-
-
-CFLAGS=/GR- /GX- /GD /G6 /Ox 
-
-
+CFLAGS=/GR- /GX- /GD /G6 /Ox /MT
 
 # the rest can stay untouched
-
 # ----------------------------------------------
 
-
-
 # all the source files from the package
-
 !include make-files.txt
 
-SRCS=SRCS+SRCS_WIN
-
-
+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
-