Commit 51c42a6e authored by thomas's avatar thomas
Browse files

attribute editor: now correctly treat empty lists


git-svn-id: https://svn.grrrr.org/ext/trunk@681 4d9ac71a-51e6-0310-8455-cad1006bcd31
parent 1361ad48
......@@ -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"
......
......@@ -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?
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment