""

svn path=/trunk/; revision=1212

10 files changed, 44 insertions, 36 deletions

diff --git a/externals/grill/flext/source/flinternal.h b/externals/grill/flext/source/flinternal.h
index c8cdcf2a..29887f8e 100644
--- a/externals/grill/flext/source/flinternal.h
+++ b/externals/grill/flext/source/flinternal.h
@@ -46,12 +46,12 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #define add_anything(clss,meth) class_addanything(clss,meth)
 
 
-#define newout_signal(clss) outlet_new(clss,&s_signal)
-#define newout_float(clss) outlet_new(clss,&s_float)
-#define newout_flint(clss) outlet_new(clss,&s_float)
-#define newout_list(clss) outlet_new(clss,&s_list)
-#define newout_symbol(clss) outlet_new(clss,&s_symbol)
-#define newout_anything(clss) outlet_new(clss,&s_anything)
+#define newout_signal(clss) outlet_new(clss,gensym("signal"))
+#define newout_float(clss) outlet_new(clss,gensym("float"))
+#define newout_flint(clss) outlet_new(clss,gensym("float"))
+#define newout_list(clss) outlet_new(clss,gensym("list"))
+#define newout_symbol(clss) outlet_new(clss,gensym("symbol"))
+#define newout_anything(clss) outlet_new(clss,gensym("anything"))
 
 #define outlet_flint(o,v) outlet_float(o,(float)(v))
 
diff --git a/externals/grill/flext/source/flout.cpp b/externals/grill/flext/source/flout.cpp
index 85a9b934..fcfaa6c8 100644
--- a/externals/grill/flext/source/flout.cpp
+++ b/externals/grill/flext/source/flout.cpp
@@ -133,16 +133,16 @@ bool flext_base::InitInlets()
 						}
 						else 
 							sym[2] = '0'+ix,sym[3] = 0;  
-					    if(ok) inlet_new(&x_obj->obj, &x_obj->obj.ob_pd, &s_float, gensym(sym)); 
+					    if(ok) inlet_new(&x_obj->obj, &x_obj->obj.ob_pd, (t_symbol *)sym_float, gensym(sym)); 
 						break;
 					}
 					case xlet::tp_sym: 
 					    (inlets[ix] = (px_object *)pd_new(px_class))->init(this,ix);  // proxy for 2nd inlet messages 
-						inlet_new(&x_obj->obj,&inlets[ix]->obj.ob_pd, &s_symbol, &s_symbol);  
+						inlet_new(&x_obj->obj,&inlets[ix]->obj.ob_pd, (t_symbol *)sym_symbol, (t_symbol *)sym_symbol);  
 						break;
 					case xlet::tp_list:
 					    (inlets[ix] = (px_object *)pd_new(px_class))->init(this,ix);  // proxy for 2nd inlet messages 
-						inlet_new(&x_obj->obj,&inlets[ix]->obj.ob_pd, &s_list, &s_list);  
+						inlet_new(&x_obj->obj,&inlets[ix]->obj.ob_pd, (t_symbol *)sym_list, (t_symbol *)sym_list);  
 						break;
 					case xlet::tp_any:
 					    (inlets[ix] = (px_object *)pd_new(px_class))->init(this,ix);  // proxy for 2nd inlet messages 
@@ -156,7 +156,7 @@ bool flext_base::InitInlets()
 						else {
 							// pd doesn't seem to be able to handle signals and messages into the same inlet...
 							
-							inlet_new(&x_obj->obj, &x_obj->obj.ob_pd, &s_signal, &s_signal);  
+							inlet_new(&x_obj->obj, &x_obj->obj.ob_pd, (t_symbol *)sym_signal, (t_symbol *)sym_signal);  
 							++insigs;
 						}
 						break;
diff --git a/externals/grill/flext/source/flproxy.cpp b/externals/grill/flext/source/flproxy.cpp
index 85981130..4406fd07 100755
--- a/externals/grill/flext/source/flproxy.cpp
+++ b/externals/grill/flext/source/flproxy.cpp
@@ -35,7 +35,7 @@ void flext_base::cb_px_anything(t_class *c,const t_symbol *s,int argc,t_atom *ar
 #define DEF_IN_FT(IX) \
 void flext_base::cb_px_ft ## IX(t_class *c,float v) { \
 	t_atom atom; SETFLOAT(&atom,v);  \
-	thisObject(c)->m_methodmain(IX,&s_float,1,&atom); \
+	thisObject(c)->m_methodmain(IX,sym_float,1,&atom); \
 }
 
 #define ADD_IN_FT(IX) \
diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp
index a77726ae..db2b1770 100644
--- a/externals/grill/flext/source/flsupport.cpp
+++ b/externals/grill/flext/source/flsupport.cpp
@@ -43,13 +43,13 @@ void flext::Setup()
 	else issetup = true;
 
 #if FLEXT_SYS == FLEXT_SYS_PD
-	sym_anything = &s_anything;
-	sym_pointer = &s_pointer;
-	sym_float = &s_float;
-	sym_symbol = &s_symbol;
-	sym_bang = &s_bang;
-	sym_list = &s_list;
-	sym_signal = &s_signal;
+	sym_anything = gensym("anything");
+	sym_pointer = gensym("pointer");
+	sym_float = gensym("float");
+	sym_symbol = gensym("symbol");
+	sym_bang = gensym("bang");
+	sym_list = gensym("list");
+	sym_signal = gensym("signal");
 #elif FLEXT_SYS == FLEXT_SYS_MAX
 	sym_int = gensym("int");
 	sym_float = gensym("float");
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index 06337150..b135b613 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -65,7 +65,7 @@ public:
 	//!	@}  FLEXT_S_MEMORY  	
 };
 
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(__BORLANDC__)
 #define NEWTHROW throw(std::bad_alloc)
 #define DELTHROW throw()
 #else
diff --git a/externals/grill/flext/tutorial/build-pd-bcc.bat b/externals/grill/flext/tutorial/build-pd-bcc.bat
index fd2c9264..a183ff09 100644
--- a/externals/grill/flext/tutorial/build-pd-bcc.bat
+++ b/externals/grill/flext/tutorial/build-pd-bcc.bat
@@ -52,17 +52,22 @@
 @make -f ..\makefile.pd-bcc NAME=lib1 SETUPFUNCTION=lib1_setup
 @cd ..
 
-rem @cd sndobj1
-rem @make -f ..\makefile.pd-bcc NAME=sndobj1~ SETUPFUNCTION=sndobj1_tilde_setup
-rem @cd ..
-
-rem @cd stk1
-rem @make -f ..\makefile.pd-bcc NAME=stk1~ SETUPFUNCTION=stk1_tilde_setup
-rem @cd ..
+@cd bind1
+@make -f ..\makefile.pd-bcc NAME=bind1 SETUPFUNCTION=bind1_setup
+@cd ..
 
-rem @cd stk2
-rem @make -f ..\makefile.pd-bcc NAME=stk2~ SETUPFUNCTION=stk2_tilde_setup
-rem @cd ..
+@cd buffer1
+@make -f ..\makefile.pd-bcc NAME=buffer1 SETUPFUNCTION=buffer1_setup
+@cd ..
 
+@rem @cd sndobj1
+@rem @make -f ..\makefile.pd-bcc NAME=sndobj1~ SETUPFUNCTION=sndobj1_tilde_setup
+@rem @cd ..
 
+@rem @cd stk1
+@rem @make -f ..\makefile.pd-bcc NAME=stk1~ SETUPFUNCTION=stk1_tilde_setup
+@rem @cd ..
 
+@rem @cd stk2
+@rem @make -f ..\makefile.pd-bcc NAME=stk2~ SETUPFUNCTION=stk2_tilde_setup
+@rem @cd ..
diff --git a/externals/grill/flext/tutorial/makefile.pd-bcc b/externals/grill/flext/tutorial/makefile.pd-bcc
index ae671ae0..6eb3a931 100644
--- a/externals/grill/flext/tutorial/makefile.pd-bcc
+++ b/externals/grill/flext/tutorial/makefile.pd-bcc
@@ -56,6 +56,8 @@ $(OUTPATH)\pd.lib: $(PDPATH)\bin\pd.dll
 
 $(OUTPATH)\$(NAME).def:
 	@echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $<
+# this next line fixes a strange problem with implib - lacking underscore?!
+	@echo IMPORTS _rtext_retext=PD.rtext_retext >> $<
 
 $(OUTPATH)\$(NAME)~.dll : $(OUTPATH)\$(NAME).dll
 	-ren $** $<
diff --git a/externals/grill/pool/makefile.pd-bcc b/externals/grill/pool/makefile.pd-bcc
index 013c0279..bb41d752 100644
--- a/externals/grill/pool/makefile.pd-bcc
+++ b/externals/grill/pool/makefile.pd-bcc
@@ -21,7 +21,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 
 
 
@@ -64,6 +64,8 @@ $(OUTPATH)\pd.lib: $(PDPATH)\bin\pd.dll
 
 $(OUTPATH)\$(NAME).def:
 	@echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $<
+# this next line fixes a strange problem with implib - lacking underscore?!
+	@echo IMPORTS _rtext_retext=PD.rtext_retext >> $<
 
 $(OUTPATH)\$(NAME).dll :: $(OUTPATH) $(OUTPATH)\$(NAME).def $(OUTPATH)\pd.lib 
 
@@ -75,6 +77,3 @@ $(OUTPATH)\$(NAME).dll :: $(OBJS)
 	@-if not exist $(INSTPATH) mkdir $(INSTPATH)
 	copy $< $(INSTPATH) >nul
 !endif
-
-
-	
\ No newline at end of file
diff --git a/externals/grill/pool/makefile.pd-msvc b/externals/grill/pool/makefile.pd-msvc
index 3644b86f..cf0893bb 100644
--- a/externals/grill/pool/makefile.pd-msvc
+++ b/externals/grill/pool/makefile.pd-msvc
@@ -1,7 +1,7 @@
 # pool - hierarchical storage object for PD and Max/MSP
 # Copyright (C) 2002 Thomas Grill (xovo@gmx.net)
 #
-# Makefile for MSVC++ 6
+# Makefile for MSVC++ 6 and 7
 #
 # usage:
 # to build run "make -f makefile.pd-msvc"
@@ -15,9 +15,9 @@ LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPAT
 LIBS=pd.lib flext-pdwin.lib
 
 # compiler definitions and flags
-DEFS=/DPD /DNT 
+DEFS=/DFLEXT_SYS=2
 
-CFLAGS=/GR- /GX- /GD /G6 /Ox /ML
+CFLAGS=/G6 /Ox /ML /EHsc
 
 # the rest can stay untouched
 # ----------------------------------------------
diff --git a/externals/grill/xsample/makefile.pd-bcc b/externals/grill/xsample/makefile.pd-bcc
index 0b959d11..59d6efc8 100644
--- a/externals/grill/xsample/makefile.pd-bcc
+++ b/externals/grill/xsample/makefile.pd-bcc
@@ -63,6 +63,8 @@ $(OUTPATH)\pd.lib: $(PDPATH)\bin\pd.dll
 
 $(OUTPATH)\$(NAME).def:
 	@echo EXPORTS $(SETUPFUNCTION) = _$(SETUPFUNCTION) > $<
+# this next line fixes a strange problem with implib - lacking underscore?!
+	@echo IMPORTS _rtext_retext=PD.rtext_retext >> $<
 
 $(OUTPATH)\$(NAME).dll :: $(OUTPATH) $(OUTPATH)\$(NAME).def $(OUTPATH)\pd.lib