various fixes to build system

fixes for build system
better templates, some minor changes
build system: added profiler mode, more fixes
added ICC/linux support
small optimizations

svn path=/trunk/; revision=2498

11 files changed, 191 insertions, 3 deletions

diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
index 1e2d61d3..22314356 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-ext.inc
@@ -26,7 +26,11 @@ $(TARGET):: $(TARGETPATH)
 $(TARGET):: $(COBJS) $(CPPOBJS)
 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
 	chmod 755 $@
+ifndef DEBUG
+ifndef PROFILE
 	strip --strip-unneeded $@
+endif
+endif
 
 ##############################################
 
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
index ae9b4a48..9f587cfc 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc-flext.inc
@@ -23,7 +23,11 @@ $(TARGET) :: $(COBJS) $(CPPOBJS)
 ifdef SHARED
 	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
 	chmod 755 $@
+ifndef DEBUG
+ifndef PROFILE
 	strip --strip-unneeded $@
+endif
+endif
 else
 	$(AR) rc $@ $(COBJS) $(CPPOBJS)
 endif
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
index 9927fb1a..4be5953d 100644
--- a/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
+++ b/externals/grill/flext/buildsys/lnx/gnumake-gcc.inc
@@ -7,16 +7,17 @@ TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
 ##############################################
 
 CFLAGS += -pthread
-LDFLAGS += -pthread -shared -Wl,-x
+LDFLAGS += -pthread -shared -Wl,-x 
 
 ##############################################
 
 ifdef DEBUG
 CFLAGS += -g
+LDFLAGS += -g
 else
 ifdef PROFILE
 CFLAGS += -g -pg
-LDFLAGS += -pg
+LDFLAGS += -g -pg
 else
 LDFLAGS += -Wl,-S
 endif
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
new file mode 100644
index 00000000..4ce1c1da
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-ext.inc
@@ -0,0 +1,46 @@
+# build class specific settings
+
+INCPATH += -I$(FLEXTINC)
+LIBPATH += -L$(FLEXTLIB) -L$(FLEXTSHLIB)
+LIBS += -l$(FLEXTNAME)
+
+##############################################
+
+# default target
+_build_: $(TARGET)
+
+$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	touch $@
+
+$(TARGETPATH):
+	mkdir -p $@
+
+$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
+	icc -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGETPATH)/%.o : $(SRCDIR)/%.c
+	icc -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGET):: $(TARGETPATH)
+
+$(TARGET):: $(COBJS) $(CPPOBJS)
+	icc $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	chmod 755 $@
+ifndef DEBUG
+ifndef PROFILE
+	strip --strip-unneeded $@
+endif
+endif
+
+##############################################
+
+_clean_:
+	-rm -r $(TARGETPATH)
+
+##############################################
+
+$(INSTPATH):
+	-mkdir -p $@
+
+_install_: $(INSTPATH)
+	install $(TARGET) $(INSTPATH)
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
new file mode 100644
index 00000000..ed06f9cf
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc-flext.inc
@@ -0,0 +1,56 @@
+# build class specific settings
+
+##############################################
+
+# default target
+_build_: $(TARGET)
+
+$(CSRCS) $(CPPSRCS): $(patsubst %,$(SRCDIR)/%,$(HDRS))
+	touch $@
+
+$(TARGETPATH):
+	-mkdir -p $@
+
+$(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
+	icc -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGETPATH)/%.o : $(SRCDIR)/%.c
+	icc -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+
+$(TARGET) :: $(TARGETPATH) 
+
+$(TARGET) :: $(COBJS) $(CPPOBJS)
+ifdef SHARED
+	icc $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	chmod 755 $@
+ifndef DEBUG
+ifndef PROFILE
+	strip --strip-unneeded $@
+endif
+endif
+else
+	$(AR) rc $@ $(COBJS) $(CPPOBJS)
+endif
+
+##############################################
+
+_clean_:
+	-rm -r $(TARGETPATH)
+
+##############################################
+
+ifdef SHARED
+FLEXTLIBINST=$(FLEXTSHLIB)
+else
+FLEXTLIBINST=$(FLEXTLIB)
+endif
+
+$(FLEXTINC):
+	-mkdir -p $@
+
+$(FLEXTLIBINST):
+	-mkdir -p $@
+
+_install_: $(FLEXTINC) $(FLEXTLIBINST)
+	install $(TARGET) $(FLEXTLIBINST)
+	install $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTINC)
diff --git a/externals/grill/flext/buildsys/lnx/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
new file mode 100644
index 00000000..2797e882
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/gnumake-icc.inc
@@ -0,0 +1,31 @@
+##############################################
+
+OBJPATH=$(OUTPATH)/$(OUTSUB)
+TARGETPATH=$(OBJPATH)
+TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
+
+##############################################
+
+CFLAGS +=
+LDFLAGS += -shared -Wl,-x 
+
+##############################################
+
+ifdef DEBUG
+CFLAGS += -g
+LDFLAGS += -g
+else
+ifdef PROFILE
+CFLAGS += -g -qp
+LDFLAGS += -g -qp
+else
+LDFLAGS += -Wl,-S
+endif
+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))) 
diff --git a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
index bf0ff666..aaff3340 100644
--- a/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
+++ b/externals/grill/flext/buildsys/lnx/pd/config-gcc.def
@@ -1,4 +1,5 @@
 # where is the PD source package?
+# (this should point to the main folder, which has a "src" subfolder)
 PDPATH=/usr/local/src/pd
 
 ###############################################################
@@ -24,7 +25,7 @@ INSTPATH=/usr/local/lib/pd/extra
 
 # user defined compiler flags
 # (check if they match your system!)
-UFLAGS=-msse
+UFLAGS=-msse -mfpmath=sse -ffast-math
 
 # user defined optimization flags
 # (check if they match your system!)
diff --git a/externals/grill/flext/buildsys/lnx/pd/config-icc.def b/externals/grill/flext/buildsys/lnx/pd/config-icc.def
new file mode 100644
index 00000000..b6d6169e
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/pd/config-icc.def
@@ -0,0 +1,34 @@
+# where is the PD source package?
+# (this should point to the main folder, which has a "src" subfolder)
+PDPATH=/usr/local/src/pd
+
+###############################################################
+
+# where do/should the flext headers reside/be built?
+FLEXTINC=/usr/local/include/flext
+
+# where do/should the flext static libraries reside/be built?
+FLEXTLIB=/usr/local/lib
+
+# where do/should the flext shared libraries reside/be built?
+FLEXTSHLIB=$(FLEXTLIB)
+
+###############################################################
+
+# where should the external be built?
+OUTPATH=pd-linux
+
+# where should the external be installed?
+INSTPATH=/usr/local/lib/pd/extra
+
+###############################################################
+
+# user defined compiler flags
+# (check if they match your system!)
+UFLAGS=
+
+# user defined optimization flags
+# (check if they match your system!)
+OFLAGS=-O3 -Ob2 -ip
+# optimizations for Pentium 4
+OFLAGS+=-mcpu=pentium4 -march=pentium4 -xMKW
diff --git a/externals/grill/flext/buildsys/lnx/pd/gnumake-icc-ext.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-icc-ext.inc
new file mode 100644
index 00000000..88feb249
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-icc-ext.inc
@@ -0,0 +1 @@
+EXT=pd_linux
diff --git a/externals/grill/flext/buildsys/lnx/pd/gnumake-icc-flext.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-icc-flext.inc
new file mode 100644
index 00000000..cecaa37a
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-icc-flext.inc
@@ -0,0 +1,6 @@
+ifdef SHARED
+EXT=so
+else
+EXT=a
+endif
+
diff --git a/externals/grill/flext/buildsys/lnx/pd/gnumake-icc.inc b/externals/grill/flext/buildsys/lnx/pd/gnumake-icc.inc
new file mode 100644
index 00000000..2b27b02f
--- /dev/null
+++ b/externals/grill/flext/buildsys/lnx/pd/gnumake-icc.inc
@@ -0,0 +1,4 @@
+DEFS += -DFLEXT_SYS=2
+
+INCPATH += -I$(PDPATH)/src
+LIBPATH += -L$(PDPATH)/bin