made default configurations generic

two more flext tutorials
fixes for Max headers
cleanups
updated build system
updated tutorials
revised the documentation
updated for OSX
upgraded version number

svn path=/trunk/; revision=2465

7 files changed, 169 insertions, 157 deletions

diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc
index 66a86234..b5873d50 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc-ext.inc
@@ -1,70 +1,70 @@
-# build class specific settings

-

-INCPATH += -I$(FLEXTINC)

-LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)

-LIBS += -l$(FLEXTNAME)

-

-# obviously header precompilation os still buggy with gcc 3.3

-

-ifdef PRECOMPILE

-#PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)

-else

-#PRECOMSRC=$(FLEXTINC)/flext.h

-endif

-ifdef PRECOMSRC

-PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch

-PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))

-endif

-

-##############################################

-

-CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS)))

-CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS)))

-COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) 

-CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) 

-

-##############################################

-

-# default target

-_build_: $(TARGET)

-

-$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))

-	touch $@

-

-# Attention: $@ doesn't work for paths with spaces....

-$(OBJPATH):

-	-mkdir -p $(OBJPATH)

-

-# Attention: $@ doesn't work for paths with spaces....

-$(TARGETPATH):

-	-mkdir -p $(TARGETPATH)

-

-$(PRECOMDST) : $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))

-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@

-

-$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp

-	$(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@

-

-$(OBJPATH)/%.o : $(SRCDIR)/%.c

-	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@

-

-$(TARGET) :: $(OBJPATH) $(TARGETPATH)

-

-$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)

-	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)

-	chmod 755 $@

-

-##############################################

-

-_clean_:

-	-rm -r $(TARGETPATH)

-	-rm -r $(OBJPATH)

-

-##############################################

-

-# Attention: $@ doesn't work for paths with spaces....

-$(INSTPATH):

-	-mkdir -p $(INSTPATH)

-

-_install_:: $(INSTPATH)

-	cp -R $(INSTTARGET) $(INSTPATH)

+# build class specific settings
+
+INCPATH += -I$(FLEXTINC)
+LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
+LIBS += -l$(FLEXTNAME)
+
+# obviously header precompilation os still buggy with gcc 3.3
+
+ifdef PRECOMPILE
+#PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)
+else
+#PRECOMSRC=$(FLEXTINC)/flext.h
+endif
+ifdef PRECOMSRC
+PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch
+PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))
+endif
+
+##############################################
+
+CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS)))
+CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS)))
+COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) 
+CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) 
+
+##############################################
+
+# default target
+_build_: $(TARGET)
+
+$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	touch $@
+
+# Attention: $@ doesn't work for paths with spaces....
+$(OBJPATH):
+	-mkdir -p $(OBJPATH)
+
+# Attention: $@ doesn't work for paths with spaces....
+$(TARGETPATH):
+	-mkdir -p $(TARGETPATH)
+
+$(PRECOMDST) : $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@
+
+$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp
+	$(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
+
+$(OBJPATH)/%.o : $(SRCDIR)/%.c
+	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGET) :: $(OBJPATH) $(TARGETPATH)
+
+$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)
+	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	chmod 755 $@
+
+##############################################
+
+_clean_:
+	-rm -r $(TARGETPATH)
+	-rm -r $(OBJPATH)
+
+##############################################
+
+# Attention: $@ doesn't work for paths with spaces....
+$(INSTPATH):
+	-mkdir -p $(INSTPATH)
+
+_install_:: $(INSTPATH)
+	cp -R $(INSTTARGET) $(INSTPATH)
diff --git a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
index b7c0ef8e..44b6f6fe 100644
--- a/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/gnumake-gcc-flext.inc
@@ -1,77 +1,77 @@
-# build class specific settings

-

-ifdef SHARED

-#LDFLAGS += -dylib_install_name $(FLEXTSHLIB)/$(OUTNAME).$(EXT)

-endif

-

-##############################################

-

-CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS)))

-CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS)))

-COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) 

-CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) 

-

-# default target

-_build_: $(TARGET)

-

-$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))

-	touch $@

-

-$(OBJPATH):

-	-mkdir -p $@

-

-$(TARGETPATH):

-	-mkdir -p $@

-

-ifdef PRECOMPILE

-PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)

-PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch

-PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))

-endif

-

-$(PRECOMDST): $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))

-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@

-

-$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp

-	$(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@

-

-$(OBJPATH)/%.o : $(SRCDIR)/%.c

-	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@

-

-$(TARGET) :: $(OBJPATH) $(TARGETPATH)

-

-$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)

-ifdef SHARED

-	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)

-	chmod 755 $@

-else

-	libtool -static -o $@ $(COBJS) $(CPPOBJS)

-endif

-

-##############################################

-

-_clean_:

-	-rm -r $(TARGETPATH)

-	-rm -r $(OBJPATH)

-

-##############################################

-

-ifdef SHARED

-FLEXTLIBINST=$(FLEXTSHLIB)

-else

-FLEXTLIBINST=$(FLEXTLIB)

-endif

-

-$(FLEXTINC):

-	-mkdir -p $@

-

-$(FLEXTLIBINST):

-	-mkdir -p $@

-

-_install_: $(FLEXTINC) $(FLEXTLIBINST)

-	install $(TARGET) $(FLEXTLIBINST)

-ifndef SHARED

-# have to rerun ranlib at install dir ?!

-	ranlib $(FLEXTLIBINST)/$(notdir $(TARGET))  

-endif

-	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)

+# build class specific settings
+
+ifdef SHARED
+#LDFLAGS += -dylib_install_name $(FLEXTSHLIB)/$(OUTNAME).$(EXT)
+endif
+
+##############################################
+
+CSRCS=$(patsubst %.c,$(SRCDIR)/%.c,$(filter %.c,$(SRCS)))
+CPPSRCS=$(patsubst %.cpp,$(SRCDIR)/%.cpp,$(filter %.cpp,$(SRCS)))
+COBJS=$(patsubst %.c,$(OBJPATH)/%.o,$(filter %.c,$(SRCS))) 
+CPPOBJS=$(patsubst %.cpp,$(OBJPATH)/%.opp,$(filter %.cpp,$(SRCS))) 
+
+# default target
+_build_: $(TARGET)
+
+$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	touch $@
+
+$(OBJPATH):
+	-mkdir -p $@
+
+$(TARGETPATH):
+	-mkdir -p $@
+
+ifdef PRECOMPILE
+PRECOMSRC=$(SRCDIR)/$(PRECOMPILE)
+PRECOMDST=$(OBJPATH)/$(notdir $(PRECOMSRC)).gch
+PRECOMINC = -include $(OBJPATH)/$(notdir $(PRECOMSRC))
+endif
+
+$(PRECOMDST): $(PRECOMSRC) $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $(PRECOMSRC) -o $@
+
+$(OBJPATH)/%.opp : $(SRCDIR)/%.cpp
+	$(CXX) -c $(CFLAGS) $(DEFS) $(PRECOMINC) $(INCPATH) $< -o $@
+
+$(OBJPATH)/%.o : $(SRCDIR)/%.c
+	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGET) :: $(OBJPATH) $(TARGETPATH)
+
+$(TARGET) :: $(PRECOMDST) $(COBJS) $(CPPOBJS)
+ifdef SHARED
+	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	chmod 755 $@
+else
+	libtool -static -o $@ $(COBJS) $(CPPOBJS)
+endif
+
+##############################################
+
+_clean_:
+	-rm -r $(TARGETPATH)
+	-rm -r $(OBJPATH)
+
+##############################################
+
+ifdef SHARED
+FLEXTLIBINST=$(FLEXTSHLIB)
+else
+FLEXTLIBINST=$(FLEXTLIB)
+endif
+
+$(FLEXTINC):
+	-mkdir -p $@
+
+$(FLEXTLIBINST):
+	-mkdir -p $@
+
+_install_: $(FLEXTINC) $(FLEXTLIBINST)
+	install $(TARGET) $(FLEXTLIBINST)
+ifndef SHARED
+# have to rerun ranlib at install dir ?!
+	ranlib $(FLEXTLIBINST)/$(notdir $(TARGET))  
+endif
+	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
diff --git a/externals/grill/flext/buildsys/mac/max/config-gcc.def b/externals/grill/flext/buildsys/mac/max/config-gcc.def
index de6c6632..7f85903a 100644
--- a/externals/grill/flext/buildsys/mac/max/config-gcc.def
+++ b/externals/grill/flext/buildsys/mac/max/config-gcc.def
@@ -1,6 +1,6 @@
 # where are the Max/MSP SDK header files?
 # you should have the latest version!
-MAXSDKPATH=/Volumes/Daten/Prog/MaxMSP-SDK/4.5\ headers/c74support
+MAXSDKPATH=/Applications/MaxMSP\ 4.5/MaxMSP-SDK/4.5\ headers/c74support
 
 ###############################################################
 
@@ -21,8 +21,16 @@ OUTPATH=max-darwin
 # where should the external be installed?
 INSTPATH=/Library/Application\ Support/Cycling\ \'74/externals/flext
 
+# where should the initialization files be installed?
+INITPATH=/Library/Application\ Support/Cycling\ \'74/init
+
+# where should the help files be installed?
+HELPPATH=/Applications/MaxMSP\ 4.5/max-help/flext
+
 ###############################################################
 
 # user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2 -mcpu=G4 -malign-natural -maltivec -faltivec
+OFLAGS=-O2
+# optimizations for G4
+#OFLAGS += -mcpu=G4 -malign-natural -maltivec -faltivec
diff --git a/externals/grill/flext/buildsys/mac/pd/config-gcc.def b/externals/grill/flext/buildsys/mac/pd/config-gcc.def
index 85a9d8bd..19198e92 100644
--- a/externals/grill/flext/buildsys/mac/pd/config-gcc.def
+++ b/externals/grill/flext/buildsys/mac/pd/config-gcc.def
@@ -1,5 +1,5 @@
 # where is the PD installation including source code?
-PDPATH=/Applications/audio/Pd-0.38-0test13.app/Contents/Resources
+PDPATH=/Applications/audio/Pd-0.38-0.app/Contents/Resources
 
 # where is the PD executable?
 PDBIN=$(PDPATH)/bin/pd
@@ -27,4 +27,6 @@ INSTPATH=$(PDPATH)/extra
 
 # user defined compiler flags
 # (check if they match your system!)
-OFLAGS=-O2 -mcpu=G4 -malign-natural -maltivec -faltivec
+OFLAGS=-O2
+# optimizations for G4
+#OFLAGS += -mcpu=G4 -malign-natural -maltivec -faltivec
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
index 90b71f03..39ab2964 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc
@@ -1,3 +1,3 @@
-EXT=pd_darwin

+EXT=pd_darwin
 
 LDFLAGS += -bundle -bundle_loader $(PDBIN)
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
index 7aa9b3b5..17d6540d 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-flext.inc
@@ -1,7 +1,7 @@
-ifdef SHARED

-EXT=dylib

-else

-EXT=a

-endif

+ifdef SHARED
+EXT=dylib
+else
+EXT=a
+endif
 
 LDFLAGS += -dynamiclib -flat_namespace -undefined suppress
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
index f00d0569..b57e87c2 100644
--- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc.inc
@@ -8,3 +8,5 @@ LIBPATH += -L$(PDPATH)/bin
 OBJPATH=$(OUTPATH)/$(OUTSUB)
 TARGETPATH=$(OBJPATH)
 TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
+INSTTARGET=$(TARGET)
+