""

svn path=/trunk/; revision=798

4 files changed, 26 insertions, 16 deletions

diff --git a/externals/grill/flext/source/flattr_ed.cpp b/externals/grill/flext/source/flattr_ed.cpp
index be86e04a..c968fe5f 100644
--- a/externals/grill/flext/source/flattr_ed.cpp
+++ b/externals/grill/flext/source/flattr_ed.cpp
@@ -71,20 +71,22 @@ void flext_base::SetAttrEditor(t_classid c)
 
 				// process current value
 				"set len [llength [expr $$var_attr_val]]\n"
-				// see if it's a list
-				"if { $len > 1 } {\n"
-					"set lst [concat $lst {list} $len [expr $$var_attr_val]]\n" 
-				"} else {\n"
+				"if { $len == 1 } {\n"
+					// it's an atom
 					"lappend lst [expr $$var_attr_val]\n" 
+				"} else {\n"
+					// it's a list
+					"set lst [concat $lst {list} $len [expr $$var_attr_val]]\n" 
 				"}\n"
 
 				// process init value
 				"set len [llength [expr $$var_attr_init]]\n"
-				// see if it's a list
-				"if { $len > 1 } {\n"
-					"set lst [concat $lst {list} $len [expr $$var_attr_init]]\n" 
-				"} else {\n"
+				"if { $len == 1 } {\n"
+					// it's an atom
 					"lappend lst [expr $$var_attr_init]\n" 
+				"} else {\n"
+					// it's a list
+					"set lst [concat $lst {list} $len [expr $$var_attr_init]]\n" 
 				"}\n"
 
 				"lappend lst [eval concat $$var_attr_save]\n" 
diff --git a/externals/grill/flext/tutorial/config-pd-msvc.txt b/externals/grill/flext/tutorial/config-pd-msvc.txt
index f77a7539..425938c2 100644
--- a/externals/grill/flext/tutorial/config-pd-msvc.txt
+++ b/externals/grill/flext/tutorial/config-pd-msvc.txt
@@ -7,19 +7,19 @@
 PDPATH=c:\programme\audio\pd		
 
 # where is MS VC++?
-MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
+# MSVCPATH=c:\programme\prog\microsoft visual studio\VC98
 
 # where do the flext libraries reside?
 FLEXTPATH=$(PDPATH)\flext
 
 # where is the SndObj include directory?
 # (leave blank or comment out to disable SndObj support)
-SNDOBJ=f:\prog\packs\sndobj\include
+SNDOBJ=f:\prog\audio\sndobj\include
 SNDOBJLIB=f:\prog\audio\sndobj\lib\sndobj.lib
 
 # where is the STK include directory?
 # (leave blank or comment out to disable STK support)
-STK=f:\prog\packs\stk\include
+STK=f:\prog\audio\stk\include
 STKLIB=f:\prog\audio\stk\lib\stk.lib
 
 # where should the examples be built?
diff --git a/externals/grill/flext/tutorial/make-sub.pd-msvc b/externals/grill/flext/tutorial/make-sub.pd-msvc
index b1ffbdf3..b34b2b51 100644
--- a/externals/grill/flext/tutorial/make-sub.pd-msvc
+++ b/externals/grill/flext/tutorial/make-sub.pd-msvc
@@ -10,9 +10,9 @@
 # includes
 INCPATH=/I"$(MSVCPATH)\include" /I"$(PDPATH)\src" /I"$(FLEXTPATH)" 
 LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)"
-LIBS=pd.lib pthreadVC.lib flext_t-pdwin.lib
+LIBS=pd.lib 
 
-CFLAGS=/GR /GD /G6 /Ox /MT
+CFLAGS=/GR /GD /G6 /Ox
 
 !ifdef SNDOBJ
 INCPATH=$(INCPATH) /I"$(SNDOBJ)" 
@@ -26,7 +26,15 @@ CFLAGS=$(CFLAGS) /GX
 !endif
 
 # compiler definitions and flags
-DEFS=/DFLEXT_SYS=2 /DFLEXT_THREADS
+DEFS=/DFLEXT_SYS=2 
+
+!ifdef THR
+LIBS=$(LIBS) flext_t-pdwin.lib pthreadVC.lib 
+DEFS=$(DEFS) /DFLEXT_THREADS
+CFLAGS=$(CFLAGS) /MT
+!else
+LIBS=$(LIBS) flext-pdwin.lib
+!endif
 
 
 
diff --git a/externals/grill/flext/tutorial/makefile.pd-msvc b/externals/grill/flext/tutorial/makefile.pd-msvc
index fa110444..e57b333b 100644
--- a/externals/grill/flext/tutorial/makefile.pd-msvc
+++ b/externals/grill/flext/tutorial/makefile.pd-msvc
@@ -38,8 +38,8 @@ normal:
 	nmake /f make-sub.pd-msvc NAME=bind1 DIR=bind1
 
 threads:
-	nmake /f make-sub.pd-msvc NAME=thread1  DIR=thread1 
-	nmake /f make-sub.pd-msvc NAME=thread2  DIR=thread2 
+	nmake /f make-sub.pd-msvc NAME=thread1  DIR=thread1 THR=1
+	nmake /f make-sub.pd-msvc NAME=thread2  DIR=thread2 THR=1	
 
 sndobj:
 	nmake /f make-sub.pd-msvc NAME=sndobj1~ DIR=sndobj1