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

10 files changed, 40 insertions, 47 deletions

diff --git a/externals/grill/flext/buildsys/win/bmake-bcc.inc b/externals/grill/flext/buildsys/win/bmake-bcc.inc
index 6e9e142b..67ce16f0 100644
--- a/externals/grill/flext/buildsys/win/bmake-bcc.inc
+++ b/externals/grill/flext/buildsys/win/bmake-bcc.inc
@@ -12,13 +12,9 @@ TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT)
 ##############################################
 # use precompiled headers
 
-!ifndef PRECOMPILE
-CFLAGS=$(CFLAGS) -Hh=flext.h
-!else
-CFLAGS=$(CFLAGS) -Hh=$(PRECOMPILE)
+!ifdef PRECOMPILE
+CFLAGS=$(CFLAGS) -Hh=$(PRECOMPILE) -H=$(OBJPATH)\precompiled.pch
 !endif
-# location of precompiled file
-CFLAGS=$(CFLAGS) -H=$(OBJPATH)\precompiled.pch
 
 ##############################################
 
diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc
index 51866686..e98de396 100644
--- a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc
@@ -6,8 +6,8 @@ TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT)
 
 ##############################################
 
-CFLAGS += -pthread
-LDFLAGS += -pthread -shared
+CFLAGS += 
+LDFLAGS += -shared
 
 ##############################################
 
diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc
index f8eea4ac..8044d19b 100644
--- a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc
@@ -18,33 +18,31 @@ _build_: $(TARGET)
 #	touch $@
 
 $(OUTPATH):
-	-cmd /c "mkdir $(subst /,\,$@)"
+	-mkdir $(subst /,\,$@)
 
 $(TARGETPATH): $(OUTPATH)
-	-cmd /c "mkdir $(subst /,\,$@)"
+	-mkdir $(subst /,\,$@)
 
 $(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+	$(CXX) -c $(CFLAGS) $(DEFS) $(subst \,/,$(INCPATH)) $< -o $(subst /,\,$@)
 
 $(TARGETPATH)/%.o : $(SRCDIR)/%.c
-	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+	$(CC) -c $(CFLAGS) $(DEFS) $(subst \,/,$(INCPATH)) $< -o $(subst /,\,$@)
 
 $(TARGET) :: $(TARGETPATH)
 
 $(TARGET) :: $(COBJS) $(CPPOBJS)
-	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) $(subst \,/,$(LIBPATH)) -o $(subst /,\,$@) $(subst /,\,$(COBJS) $(CPPOBJS) $(LIBS))
 	-strip --strip-unneeded $@
 
 ##############################################
 
 _clean_:
-	-cmd /c "del /q $(subst /,\,$(TARGETPATH)/*.*)" > nul
-	-cmd /c "rmdir /q $(subst /,\,$(TARGETPATH))" > nul
+	-del /q $(subst /,\,$(TARGETPATH)/*.*) > nul
+	-rmdir /q $(subst /,\,$(TARGETPATH)) > nul
 
 ##############################################
 
-$(INSTPATH):
-	-cmd /c "mkdir $(subst /,\,$@)"
-
-_install_: $(INSTPATH)
-	cmd /c "copy $(subst /,\,$(TARGET) $(INSTPATH))"
+_install_:
+	@if not exist $(subst /,\,$(INSTPATH)) -mkdir $(subst /,\,$(INSTPATH))
+	copy $(subst /,\,$(TARGET) $(INSTPATH))
diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc
index 69b8afac..8cd51720 100644
--- a/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-mingw-flext.inc
@@ -9,22 +9,22 @@ _build_: $(TARGET)
 #	touch $@
 
 $(OUTPATH):
-	-cmd /c "mkdir $(subst /,\,$@)"
+	-mkdir $(subst /,\,$@)
 
 $(TARGETPATH): $(OUTPATH)
-	-cmd /c "mkdir $(subst /,\,$@)"
+	-mkdir $(subst /,\,$@)
 
 $(TARGETPATH)/%.opp : $(SRCDIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+	$(CXX) -c $(CFLAGS) $(DEFS) $(subst \,/,$(INCPATH)) $< -o $(subst /,\,$@)
 
 $(TARGETPATH)/%.o : $(SRCDIR)/%.c
-	$(CC) -c $(CFLAGS) $(DEFS) $(INCPATH) $< -o $@
+	$(CC) -c $(CFLAGS) $(DEFS) $(subst \,/,$(INCPATH)) $< -o $(subst /,\,$@)
 
 $(TARGET) :: $(TARGETPATH)
 
 $(TARGET) :: $(COBJS) $(CPPOBJS)
 ifdef SHARED
-	$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) $(LIBPATH) -o $(subst /,\,$@) $(subst /,\,$(COBJS) $(CPPOBJS) $(LIBS))
 	-strip --strip-unneeded $@
 else
 	$(AR) rc $@ $(COBJS) $(CPPOBJS)
@@ -33,8 +33,8 @@ endif
 ##############################################
 
 _clean_:
-	-cmd /c "del /q $(subst /,\,$(TARGETPATH)/*.*)" > nul
-	-cmd /c "rmdir /q $(subst /,\,$(TARGETPATH))" > nul
+	-del /q $(subst /,\,$(TARGETPATH)/*.*) > nul
+	-rmdir /q $(subst /,\,$(TARGETPATH)) > nul
 
 ##############################################
 
@@ -44,14 +44,9 @@ else
 FLEXTLIBINST=$(FLEXTLIB)
 endif
 
-$(FLEXTINC):
-	-cmd /c "mkdir $(subst /,\,$@)"
-
-$(FLEXTLIBINST):
-	-cmd /c "mkdir $(subst /,\,$@)"
-
-_install_:: $(FLEXTINC) $(FLEXTLIBINST)
-
 _install_::
-	cmd /c "copy $(subst /,\,$(TARGET) $(FLEXTLIBINST))"
-	-cmd /c "for %i in ($(HDRS)) do @cmd /c copy $(SRCDIR)\%i $(subst /,\,$(FLEXTPATH))" > nul
+	@if not exist $(subst /,\,$(FLEXTINC)) -mkdir $(subst /,\,$(FLEXTINC))
+	@if not exist $(subst /,\,$(FLEXTLIBINST)) -mkdir $(subst /,\,$(FLEXTLIBINST))
+
+	copy $(subst /,\,$(TARGET) $(FLEXTLIBINST))
+	-for %%i in ($(HDRS)) do @copy $(SRCDIR)\%%i $(subst /,\,$(FLEXTINC)) > nul
diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/gnumake-mingw.inc
index 35ffc3a4..43884e15 100644
--- a/externals/grill/flext/buildsys/win/gnumake-mingw.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-mingw.inc
@@ -6,8 +6,8 @@ TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT)
 
 ##############################################
 
-CFLAGS += -pthread
-LDFLAGS += -pthread -shared
+CFLAGS += 
+LDFLAGS += -shared
 
 ##############################################
 
diff --git a/externals/grill/flext/buildsys/win/max/config-mingw.def b/externals/grill/flext/buildsys/win/max/config-mingw.def
index d3deb574..9c9e3d4a 100644
--- a/externals/grill/flext/buildsys/win/max/config-mingw.def
+++ b/externals/grill/flext/buildsys/win/max/config-mingw.def
@@ -33,7 +33,7 @@ HELPPATH="%ProgramFiles%/MaxMSP 4.5/max-help/flext"
 
 # user defined compiler flags
 # (check if they match your system!)
-UFLAGS=-msse
+UFLAGS=-msse -ffast-math
 
 # user defined optimization flags
 # (check if they match your system!)
diff --git a/externals/grill/flext/buildsys/win/pd/config-bcc.def b/externals/grill/flext/buildsys/win/pd/config-bcc.def
index 97553013..e9d97eb8 100644
--- a/externals/grill/flext/buildsys/win/pd/config-bcc.def
+++ b/externals/grill/flext/buildsys/win/pd/config-bcc.def
@@ -1,4 +1,5 @@
-# where is PD?
+# where is the PD installation?
+# (this should point to the main folder, which has a "src" subfolder)
 PDPATH="c:\program files\pd"
 
 # where is BorlandC++?
diff --git a/externals/grill/flext/buildsys/win/pd/config-cygwin.def b/externals/grill/flext/buildsys/win/pd/config-cygwin.def
index 3a7098ee..d7c319e0 100644
--- a/externals/grill/flext/buildsys/win/pd/config-cygwin.def
+++ b/externals/grill/flext/buildsys/win/pd/config-cygwin.def
@@ -1,4 +1,5 @@
-# where is PD?
+# where is the PD installation?
+# (this should point to the main folder, which has a "src" subfolder)
 PDPATH=/cygdrive/c/programme/pd
 
 ###############################################################
@@ -24,10 +25,10 @@ INSTPATH=$(PDPATH)/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!)
 OFLAGS=-O3
 # optimizations for Pentium 4
-OFLAGS+=-march=pentium4 
+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 6bd5b718..a4ae2f2a 100644
--- a/externals/grill/flext/buildsys/win/pd/config-mingw.def
+++ b/externals/grill/flext/buildsys/win/pd/config-mingw.def
@@ -1,4 +1,5 @@
-# where is PD?
+# where is the PD installation?
+# (this should point to the main folder, which has a "src" subfolder)
 PDPATH="%ProgramFiles%\pd"
 
 ###############################################################
@@ -24,7 +25,7 @@ INSTPATH=$(PDPATH)\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/win/pd/config-msvc.def b/externals/grill/flext/buildsys/win/pd/config-msvc.def
index 830eead3..9db081e4 100644
--- a/externals/grill/flext/buildsys/win/pd/config-msvc.def
+++ b/externals/grill/flext/buildsys/win/pd/config-msvc.def
@@ -1,4 +1,5 @@
-# where is PD?
+# where is the PD installation?
+# (this should point to the main folder, which has a "src" subfolder)
 PDPATH="%ProgramFiles%\pd"
 
 # where is MS VC++?