better templates, some minor changes

git-svn-id: https://svn.grrrr.org/ext/trunk@965 4d9ac71a-51e6-0310-8455-cad1006bcd31

build/bmake-win-bcc.inc

+!ifdef SIMD
+DEFS=$(DEFS) /DFLEXT_USE_SIMD
+!endif
+
 !ifdef SNDOBJ
 SRCS=$(SRCS) $(SRCS_SNDOBJ)
 HDRS=$(HDRS) $(HDRS_SNDOBJ)

build/config-mac.def

+# uncomment to inhibit SIMD usage
+SIMD=1
+
 # where is the STK installation?
 # (uncomment the line with # to disable STK support)
 #STK=/usr/local/lib/stk

build/gnumake-mac-gcc.inc

+ifdef SIMD
+DEFS += -DFLEXT_USE_SIMD
+endif
+
 ifdef SNDOBJ
 SRCS+=$(SRCS_SNDOBJ)
 HDRS+=$(HDRS_SNDOBJ)

build/gnumake-win-cygwin.inc

+ifdef SIMD
+DEFS += -DFLEXT_USE_SIMD
+endif
+
 ifdef SNDOBJ
 SRCS+=$(SRCS_SNDOBJ)
 HDRS+=$(HDRS_SNDOBJ)

build/gnumake-win-mingw.inc

+ifdef SIMD
+DEFS += -DFLEXT_USE_SIMD
+endif
+
 ifdef SNDOBJ
 SRCS+=$(SRCS_SNDOBJ)
 HDRS+=$(HDRS_SNDOBJ)

build/nmake-win-msvc.inc

+!ifdef SIMD
+DEFS=$(DEFS) /DFLEXT_USE_SIMD
+!endif
+
 !ifdef SNDOBJ
 SRCS=$(SRCS) $(SRCS_SNDOBJ)
 HDRS=$(HDRS) $(HDRS_SNDOBJ)

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
+

buildsys/gnumake.mak

@@ -90,7 +90,7 @@ $(SYSCONFIG): $(SYSDEFAULT)
 	@echo -------------------------------------------------------------------------
 	@false
 
-ifdef BUILDDIR	
+ifdef BUILDDIR
 $(USRCONFIG): $(USRDEFAULT)
 	@cp $< $@
 	@echo -------------------------------------------------------------------------

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

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 

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

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

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

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
 

buildsys/targets.inc

-all: build-default-default
+all: build
+
+build: build-default-default
 
 clean: clean-default-default
 

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

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

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

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 

buildsys/win/nmake-msvc.inc

@@ -30,6 +30,8 @@ LDFLAGS=$(LDFLAGS) /nologo
 
 ##############################################
 
+CFLAGS=$(CFLAGS) $(UFLAGS)
+
 !ifdef DEBUG
 
 CFLAGS=$(CFLAGS) /D_DEBUG