updated for OSX

better templates, some minor changes
fix for showing attributes on select (and recreate the object on edit)
cleanups

svn path=/trunk/; revision=2469

18 files changed, 72 insertions, 19 deletions

diff --git a/externals/grill/flext/buildsys/build-gcc.sh b/externals/grill/flext/buildsys/build-gcc.sh
index ab4b5570..f8575c99 100644
--- a/externals/grill/flext/buildsys/build-gcc.sh
+++ b/externals/grill/flext/buildsys/build-gcc.sh
@@ -3,3 +3,4 @@
 build=${0%/*}/
 
 make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=gcc BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9
+
diff --git a/externals/grill/flext/buildsys/gnumake.mak b/externals/grill/flext/buildsys/gnumake.mak
index 8ff71f97..92ee6f76 100644
--- a/externals/grill/flext/buildsys/gnumake.mak
+++ b/externals/grill/flext/buildsys/gnumake.mak
@@ -90,7 +90,7 @@ $(SYSCONFIG): $(SYSDEFAULT)
 	@echo -------------------------------------------------------------------------
 	@false
 
-ifdef BUILDDIR	
+ifdef BUILDDIR
 $(USRCONFIG): $(USRDEFAULT)
 	@cp $< $@
 	@echo -------------------------------------------------------------------------
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
index 55022c36..70a4601e 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
@@ -6,10 +6,13 @@ TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
 
 ##############################################
 
-LDFLAGS += -shared
+CFLAGS += -pthread
+LDFLAGS += -pthread -shared
 
 ##############################################
 
+CFLAGS += $(UFLAGS)
+
 ifdef DEBUG
 CFLAGS += -g -D_DEBUG
 else
diff --git a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
index c58ab238..bf0ff666 100644
--- a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
+++ b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
@@ -24,6 +24,10 @@ INSTPATH=/usr/local/lib/pd/extra
 
 # user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2
+UFLAGS=-msse
+
+# user defined optimization flags
+# (check if they match your system!)
+OFLAGS=-O3
 # optimizations for Pentium 4
-#OFLAGS+=-march=pentium4 -msse
+OFLAGS+=-march=pentium4 
diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
index 661c422d..ffc9c6ef 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc.inc
@@ -4,6 +4,8 @@ LDFLAGS += -dynamic -Wl,-x -framework ApplicationServices -framework vecLib
 
 ##############################################
 
+CFLAGS += $(UFLAGS)
+
 ifdef DEBUG
 CFLAGS += -g -D_DEBUG
 else
diff --git a/externals/grill/flext/buildsys/mac/max/config-gcc.def b/externals/grill/flext/buildsys/mac/max/config-gcc.def
index 7f85903a..a848379a 100644
--- a/externals/grill/flext/buildsys/mac/max/config-gcc.def
+++ b/externals/grill/flext/buildsys/mac/max/config-gcc.def
@@ -31,6 +31,10 @@ HELPPATH=/Applications/MaxMSP\ 4.5/max-help/flext
 
 # user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2
+UFLAGS=-maltivec -faltivec
+
+# user defined optimization flags
+# (check if they match your system!)
+OFLAGS=-O3
 # optimizations for G4
-#OFLAGS += -mcpu=G4 -malign-natural -maltivec -faltivec
+OFLAGS+=-mcpu=G4
diff --git a/externals/grill/flext/buildsys/mac/pd/config-gcc.def b/externals/grill/flext/buildsys/mac/pd/config-gcc.def
index 19198e92..0005b7c8 100644
--- a/externals/grill/flext/buildsys/mac/pd/config-gcc.def
+++ b/externals/grill/flext/buildsys/mac/pd/config-gcc.def
@@ -25,8 +25,12 @@ INSTPATH=$(PDPATH)/extra
 
 ###############################################################
 
+# user defined optimization flags
+# (check if they match your system!)
+UFLAGS=-maltivec -faltivec
+
 # user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2
+OFLAGS=-O3
 # optimizations for G4
-#OFLAGS += -mcpu=G4 -malign-natural -maltivec -faltivec
+OFLAGS+=-mcpu=G4
diff --git a/externals/grill/flext/buildsys/readme.txt b/externals/grill/flext/buildsys/readme.txt
index f1a93363..e42e860d 100644
--- a/externals/grill/flext/buildsys/readme.txt
+++ b/externals/grill/flext/buildsys/readme.txt
@@ -167,6 +167,9 @@ Macro names
 

 PKGINFO - filename for package information (must reside in project folder)

 

+UFLAGS - user defined compiler flags

+OFLAGS - user defined optimization flags (not used in debug builds)

+

 CFLAGS - compiler flags

 LDFLAGS - linker flags

 

diff --git a/externals/grill/flext/buildsys/targets.inc b/externals/grill/flext/buildsys/targets.inc
index 86cd3add..514ef2fb 100644
--- a/externals/grill/flext/buildsys/targets.inc
+++ b/externals/grill/flext/buildsys/targets.inc
@@ -1,4 +1,6 @@
-all: build-default-default

+all: build

+

+build: build-default-default

 

 clean: clean-default-default

 

diff --git a/externals/grill/flext/buildsys/win/bmake-bcc.inc b/externals/grill/flext/buildsys/win/bmake-bcc.inc
index e852ea9a..131dc61e 100644
--- a/externals/grill/flext/buildsys/win/bmake-bcc.inc
+++ b/externals/grill/flext/buildsys/win/bmake-bcc.inc
@@ -28,6 +28,8 @@ LDFLAGS=$(LDFLAGS) /C /Tpd
 
 ##############################################
 
+CFLAGS=$(CFLAGS) $(UFLAGS)
+
 !ifdef DEBUG
 CFLAGS=$(CFLAGS) -v -D_DEBUG
 LDFLAGS=$(LDFLAGS) /v
diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc
index 55022c36..70a4601e 100644
--- a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc
@@ -6,10 +6,13 @@ TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
 
 ##############################################
 
-LDFLAGS += -shared
+CFLAGS += -pthread
+LDFLAGS += -pthread -shared
 
 ##############################################
 
+CFLAGS += $(UFLAGS)
+
 ifdef DEBUG
 CFLAGS += -g -D_DEBUG
 else
diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/gnumake-mingw.inc
index d32f93e6..1bb72d6b 100644
--- a/externals/grill/flext/buildsys/win/gnumake-mingw.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-mingw.inc
@@ -6,10 +6,13 @@ TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT)
 
 ##############################################
 
-LDFLAGS += -shared
+CFLAGS += -pthread
+LDFLAGS += -pthread -shared
 
 ##############################################
 
+CFLAGS += $(UFLAGS)
+
 ifdef DEBUG
 CFLAGS += -g -D_DEBUG
 else
diff --git a/externals/grill/flext/buildsys/win/max/config-mingw.def b/externals/grill/flext/buildsys/win/max/config-mingw.def
index 2727fce6..d3deb574 100644
--- a/externals/grill/flext/buildsys/win/max/config-mingw.def
+++ b/externals/grill/flext/buildsys/win/max/config-mingw.def
@@ -31,8 +31,12 @@ HELPPATH="%ProgramFiles%/MaxMSP 4.5/max-help/flext"
 
 ###############################################################
 
-# some user-definable flags
+# user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2 
+UFLAGS=-msse
+
+# user defined optimization flags
+# (check if they match your system!)
+OFLAGS=-O3
 # optimizations for Pentium 4
-#OFLAGS += -march=pentium4 -msse
+OFLAGS+=-march=pentium4 
diff --git a/externals/grill/flext/buildsys/win/nmake-msvc.inc b/externals/grill/flext/buildsys/win/nmake-msvc.inc
index b8a51425..b1fe1acc 100644
--- a/externals/grill/flext/buildsys/win/nmake-msvc.inc
+++ b/externals/grill/flext/buildsys/win/nmake-msvc.inc
@@ -30,6 +30,8 @@ LDFLAGS=$(LDFLAGS) /nologo
 
 ##############################################
 
+CFLAGS=$(CFLAGS) $(UFLAGS)
+
 !ifdef DEBUG
 
 CFLAGS=$(CFLAGS) /D_DEBUG
diff --git a/externals/grill/flext/buildsys/win/pd/config-bcc.def b/externals/grill/flext/buildsys/win/pd/config-bcc.def
index e473c6a7..97553013 100644
--- a/externals/grill/flext/buildsys/win/pd/config-bcc.def
+++ b/externals/grill/flext/buildsys/win/pd/config-bcc.def
@@ -27,4 +27,8 @@ INSTPATH=$(PDPATH)\extra
 
 # user defined compiler flags
 # (check if they match your system!)
+UFLAGS=
+
+# user defined optimization flags
+# (check if they match your system!)
 OFLAGS=-6 -O2 -OS -ff -d
diff --git a/externals/grill/flext/buildsys/win/pd/config-cygwin.def b/externals/grill/flext/buildsys/win/pd/config-cygwin.def
index 980ebc77..3a7098ee 100644
--- a/externals/grill/flext/buildsys/win/pd/config-cygwin.def
+++ b/externals/grill/flext/buildsys/win/pd/config-cygwin.def
@@ -24,6 +24,10 @@ INSTPATH=$(PDPATH)/extra
 
 # user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2
+UFLAGS=-msse
+
+# user defined optimization flags
+# (check if they match your system!)
+OFLAGS=-O3
 # optimizations for Pentium 4
-#OFLAGS += -march=pentium4 -msse
+OFLAGS+=-march=pentium4 
diff --git a/externals/grill/flext/buildsys/win/pd/config-mingw.def b/externals/grill/flext/buildsys/win/pd/config-mingw.def
index 9a65dfd9..6bd5b718 100644
--- a/externals/grill/flext/buildsys/win/pd/config-mingw.def
+++ b/externals/grill/flext/buildsys/win/pd/config-mingw.def
@@ -24,6 +24,10 @@ INSTPATH=$(PDPATH)\extra
 
 # user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2
+UFLAGS=-msse
+
+# user defined optimization flags
+# (check if they match your system!)
+OFLAGS=-O3
 # optimizations for Pentium 4
-#OFLAGS += -march=pentium4 -msse
+OFLAGS+=-march=pentium4 
diff --git a/externals/grill/flext/buildsys/win/pd/config-msvc.def b/externals/grill/flext/buildsys/win/pd/config-msvc.def
index 7d808765..830eead3 100644
--- a/externals/grill/flext/buildsys/win/pd/config-msvc.def
+++ b/externals/grill/flext/buildsys/win/pd/config-msvc.def
@@ -29,9 +29,13 @@ INSTPATH=$(PDPATH)\extra
 
 # user defined compiler flags
 # (check if they match your system!)
+UFLAGS=
+
+# user defined optimization flags
+# (check if they match your system!)
 OFLAGS=/Ox
 # optimizations for Pentium 4
-#OFLAGS=$(OFLAGS) /G6 /arch:SSE
+OFLAGS=$(OFLAGS) /G6 /arch:SSE
 
 # uncomment to link against dynamic C runtime libraries
 # (don't use this if you want to distribute the built product)