""

svn path=/trunk/; revision=562

5 files changed, 22 insertions, 25 deletions

diff --git a/externals/grill/py/make-files.txt b/externals/grill/py/make-files.txt
new file mode 100644
index 00000000..dec24613
--- /dev/null
+++ b/externals/grill/py/make-files.txt
@@ -0,0 +1,6 @@
+# all the source files from the package
+SRCDIR=source
+
+SRCS= main.cpp py.cpp pyext.cpp modmeth.cpp clmeth.cpp register.cpp pyargs.cpp bound.cpp
+
+HDRS= main.h pyext.h
diff --git a/externals/grill/py/makefile.pd-bcc b/externals/grill/py/makefile.pd-bcc
index e94abdf4..9141ffb8 100644
--- a/externals/grill/py/makefile.pd-bcc
+++ b/externals/grill/py/makefile.pd-bcc
@@ -23,7 +23,7 @@ LIBPATH=-L$(BCCPATH)\lib -L$(PDPATH)\lib
 LIBS=cw32.lib import32.lib C0D32.OBJ 
 
 # compiler definitions and flags
-DEFS=-DPD -DNT 
+DEFS=-DFLEXT_SYS=2 
 CFLAGS=-6 -O2 -OS -ff -tWD 
 
 
@@ -31,8 +31,7 @@ CFLAGS=-6 -O2 -OS -ff -tWD
 # ----------------------------------------------
 
 # all the source files from the package
-SRCS= main.cpp py.cpp pyext.cpp modmeth.cpp clmeth.cpp register.cpp pyargs.cpp bound.cpp
-HDRS= main.h pyext.h
+!include make-files.txt
 
 # default target
 all: $(OUTPATH)\$(NAME).dll
@@ -55,7 +54,7 @@ OBJS= $(SRCS:.cpp=.obj)
 #$(SRCS): $(HDRS)
 #	-touch $<
 
-{source}.cpp.obj:
+{$(SRCDIR)}.cpp.obj:
 	bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $<
 
 $(OUTPATH):
diff --git a/externals/grill/py/makefile.pd-darwin b/externals/grill/py/makefile.pd-darwin
index 1351d834..ec0eeeba 100755
--- a/externals/grill/py/makefile.pd-darwin
+++ b/externals/grill/py/makefile.pd-darwin
@@ -17,7 +17,7 @@ FLEXTLIB=${FLEXTPATH}/flext_t.a
 # compiler+linker stuff	
 INCLUDES=${PDPATH} ${FLEXTPATH} ${PYTHONINCLUDE}
 LIBPATH= ${PYTHONLIB}
-FLAGS=-DPD -Dunix -DMACOSX -DFLEXT_THREADS
+FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
 CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes # -maltivec
 #CFLAGS=-g
 LIBS=m python${PYTHONVER}
@@ -29,25 +29,22 @@ LDFLAGS=-bundle -bundle_loader ${PD}
 NAME=py
 
 # all the source files from the package
-SRCS=main.cpp py.cpp pyext.cpp bound.cpp clmeth.cpp modmeth.cpp pyargs.cpp register.cpp
-HDRS=main.h pyext.h
+include make-files.txt
 
 
-DIR=source
-
 TARGET=$(TARGDIR)/$(NAME).pd_darwin
 MAKEFILE=makefile.pd-darwin
 
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(CONFIG)
+$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(MAKEFILE) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
 	mkdir $(TARGDIR)
 
-$(TARGDIR)/%.o : $(DIR)/%.cpp
+$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES)) $< -o $@
 
 $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
diff --git a/externals/grill/py/makefile.pd-linux b/externals/grill/py/makefile.pd-linux
index af2b58d2..0c90892f 100644
--- a/externals/grill/py/makefile.pd-linux
+++ b/externals/grill/py/makefile.pd-linux
@@ -17,7 +17,7 @@ FLEXTLIB=$(FLEXTPATH)/flext_t.a
 # compiler+linker stuff	
 INCLUDES=$(PDPATH) $(PYTHONINCLUDE)
 LIBPATH=$(PYTHONLIB)
-FLAGS=-DPD -DFLEXT_THREADS
+FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
 CFLAGS=-O6 -mcpu=pentiumpro
 #CFLAGS=-g
 LIBS=m util python$(PYTHONVER)  
@@ -30,21 +30,20 @@ LIBS=m util python$(PYTHONVER)
 NAME=py
 
 # all the source files from the package
-SRCS=main.cpp py.cpp pyext.cpp bound.cpp clmeth.cpp modmeth.cpp pyargs.cpp register.cpp
-HDRS=main.h pyext.h
+include make-files.txt
 
 TARGET=$(TARGDIR)/$(NAME).pd_linux
 
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,source/%,$(SRCS)): $(patsubst %,source/%,$(HDRS)) $(FLEXTLIB) $(CONFIG)
+$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
 	mkdir $(TARGDIR)
 
-$(TARGDIR)/%.o : source/%.cpp
+$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
 $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
diff --git a/externals/grill/py/makefile.pd-msvc b/externals/grill/py/makefile.pd-msvc
index 921a7a8d..46f569a3 100644
--- a/externals/grill/py/makefile.pd-msvc
+++ b/externals/grill/py/makefile.pd-msvc
@@ -15,21 +15,17 @@ LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPAT
 LIBS=pd.lib pthreadVC.lib flext_t-pdwin.lib $(PYTHONLIB)
 
 # compiler definitions and flags
-DEFS=/DPD /DNT /DFLEXT_THREADS
+DEFS=/DFLEXT_SYS=2 /DFLEXT_THREADS
 
 CFLAGS=/GR- /GX- /GD /G6 /Ox /MT
 
 # the rest can stay untouched
 # ----------------------------------------------
 
-# all the source files from the package
-SRCS= main.cpp py.cpp pyext.cpp modmeth.cpp clmeth.cpp register.cpp pyargs.cpp bound.cpp
-HDRS= main.h pyext.h
-
-# -----------------------------------------------
-
 NAME=py
-DIR=source
+
+# all the source files from the package
+!include make-files.txt
 
 all: $(OUTPATH) $(OUTPATH)\$(NAME).dll
 
@@ -43,7 +39,7 @@ OBJS= $(SRCS:.cpp=.obj)
 $(OUTPATH):
 	-mkdir $(OUTPATH) > nul
 
-{$(DIR)}.cpp{}.obj:
+{$(SRCDIR)}.cpp{}.obj:
 	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@
 
 $(OUTPATH)\$(NAME).dll: $(OBJS)