updated make system

build system for OSX
simplified make system
reconsidered flext::buffer:Update
added object construction and destruction flags
updated build system

svn path=/trunk/; revision=2447

16 files changed, 98 insertions, 29 deletions

diff --git a/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc b/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc
new file mode 100644
index 00000000..b2234c5b
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/bmake-bcc-ext.inc
@@ -0,0 +1 @@
+EXT=dll

diff --git a/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc b/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc
new file mode 100644
index 00000000..a080ae72
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/bmake-bcc-flext.inc
@@ -0,0 +1,5 @@
+!ifdef SHARED

+EXT=dll

+!else

+EXT=lib

+!endif

diff --git a/externals/grill/flext/buildsys/win/pd/make-bcc.inc b/externals/grill/flext/buildsys/win/pd/bmake-bcc.inc
index c4a9892c..3b257b0d 100644
--- a/externals/grill/flext/buildsys/win/pd/make-bcc.inc
+++ b/externals/grill/flext/buildsys/win/pd/bmake-bcc.inc
@@ -4,5 +4,3 @@ INCPATH=$(INCPATH) -I$(PDPATH)\src
 
 # these are both in FLEXTPATH
 LIBS=$(LIBS) pd.lib pthreadVC.lib
-
-EXT=dll
diff --git a/externals/grill/flext/buildsys/win/pd/config-bcc.def b/externals/grill/flext/buildsys/win/pd/config-bcc.def
index 85f78a22..285e5b02 100644
--- a/externals/grill/flext/buildsys/win/pd/config-bcc.def
+++ b/externals/grill/flext/buildsys/win/pd/config-bcc.def
@@ -1,18 +1,30 @@
 # where is PD?
 PDPATH=c:\programme\audio\pd		
 
-# where should the external be installed?
-INSTPATH=$(PDPATH)\extra
-
-# where do the flext headers and libraries reside?
-FLEXTPATH=$(PDPATH)\flext
-
 # where is BorlandC++?
 BCCPATH=C:\Programme\prog\bcc55
 
+###############################################################
+
+# where do/should the flext headers reside/be built?
+FLEXTINC=$(PDPATH)\flext
+
+# where do/should the flext static libraries reside/be built?
+FLEXTLIB=$(FLEXTINC)
+
+# where do/should the flext shared libraries reside/be built?
+FLEXTSHLIB=$(FLEXTINC)
+
+###############################################################
+
 # where should the external be built?
 OUTPATH=pd-bcc
 
+# where should the external be installed?
+INSTPATH=$(PDPATH)\extra
+
+###############################################################
+
 # user defined compiler 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 0a63ea3f..11bca921 100644
--- a/externals/grill/flext/buildsys/win/pd/config-cygwin.def
+++ b/externals/grill/flext/buildsys/win/pd/config-cygwin.def
@@ -1,15 +1,27 @@
 # where is PD?
 PDPATH=/cygdrive/c/programme/audio/pd
 
-# where should the external be installed?
-INSTPATH=$(PDPATH)/extra
+###############################################################
+
+# where do/should the flext headers reside/be built?
+FLEXTINC=$(PDPATH)/flext
+
+# where do/should the flext static libraries reside/be built?
+FLEXTLIB=$(FLEXTINC)
+
+# where do/should the flext shared libraries reside/be built?
+FLEXTSHLIB=$(FLEXTINC)
 
-# where do the flext headers and libraries reside?
-FLEXTPATH=$(PDPATH)/flext
+###############################################################
 
 # where should the external be built?
 OUTPATH=pd-cygwin
 
+# where should the external be installed?
+INSTPATH=$(PDPATH)/extra
+
+###############################################################
+
 # user defined compiler flags
 # (check if they match your system!)
 OFLAGS=-O2 -march=pentium4 -msse
diff --git a/externals/grill/flext/buildsys/win/pd/config-mingw.def b/externals/grill/flext/buildsys/win/pd/config-mingw.def
index 2082f34b..7b720f58 100644
--- a/externals/grill/flext/buildsys/win/pd/config-mingw.def
+++ b/externals/grill/flext/buildsys/win/pd/config-mingw.def
@@ -1,15 +1,27 @@
 # where is PD?
 PDPATH=c:/programme/audio/pd
 
-# where should the external be installed?
-INSTPATH=$(PDPATH)/extra
+###############################################################
+
+# where do/should the flext headers reside/be built?
+FLEXTINC=$(PDPATH)/flext
+
+# where do/should the flext static libraries reside/be built?
+FLEXTLIB=$(FLEXTINC)
+
+# where do/should the flext shared libraries reside/be built?
+FLEXTSHLIB=$(FLEXTINC)
 
-# where do the flext headers and libraries reside?
-FLEXTPATH=$(PDPATH)/flext
+###############################################################
 
 # where should the external be built?
 OUTPATH=pd-mingw
 
+# where should the external be installed?
+INSTPATH=$(PDPATH)/extra
+
+###############################################################
+
 # user defined compiler flags
 # (check if they match your system!)
 OFLAGS=-O2 -march=pentium4 -msse
diff --git a/externals/grill/flext/buildsys/win/pd/config-msvc.def b/externals/grill/flext/buildsys/win/pd/config-msvc.def
index e50837a6..a7171ff2 100644
--- a/externals/grill/flext/buildsys/win/pd/config-msvc.def
+++ b/externals/grill/flext/buildsys/win/pd/config-msvc.def
@@ -1,19 +1,36 @@
 # where is PD?
-PDPATH=c:\programme\audio\pd		
-
-# where should the external be installed?
-INSTPATH=$(PDPATH)\extra
-
-# where do the flext headers and libraries reside?
-FLEXTPATH=$(PDPATH)\flext
+PDPATH=c:\programme\audio\pd	
 
 # where is MS VC++?
 # (not necessary if the build is run with the compiler environment)
 # MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7
 
+###############################################################
+
+# where do/should the flext headers reside/be built?
+FLEXTINC=$(PDPATH)\flext
+
+# where do/should the flext static libraries reside/be built?
+FLEXTLIB=$(FLEXTINC)
+
+# where do/should the flext shared libraries reside/be built?
+FLEXTSHLIB=$(FLEXTINC)
+
+###############################################################
+
 # where should the external be built?
+# (relative one-level subpath to project folder)
 OUTPATH=pd-msvc
 
+# where should externals be installed?
+INSTPATH=$(PDPATH)\extra
+
+###############################################################
+
 # user defined compiler flags
 # (check if they match your system!)
 OFLAGS=/G6 /Ox /arch:SSE
+
+# uncomment to link against dynamic C runtime libraries
+# (don't use this if you want to distribute the built product)
+#DYNAMIC=1
diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc
new file mode 100644
index 00000000..b2234c5b
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-ext.inc
@@ -0,0 +1 @@
+EXT=dll

diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc
new file mode 100644
index 00000000..5c8a7a83
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin-flext.inc
@@ -0,0 +1,5 @@
+ifdef SHARED

+EXT=dll

+else

+EXT=a

+endif

diff --git a/externals/grill/flext/buildsys/win/pd/make-cygwin.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc
index d1641769..054526c0 100644
--- a/externals/grill/flext/buildsys/win/pd/make-cygwin.inc
+++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc
@@ -7,5 +7,3 @@ CFLAGS += -include /usr/include/pthread.h -DPTHREAD_H
 
 LIBS += $(PDPATH)/bin/pd.dll 
 #LIBS += $(PDPATH)/bin/pthreadVC.dll
-
-EXT=dll
diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc
new file mode 100644
index 00000000..b2234c5b
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-ext.inc
@@ -0,0 +1 @@
+EXT=dll

diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc
new file mode 100644
index 00000000..5c8a7a83
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/gnumake-mingw-flext.inc
@@ -0,0 +1,5 @@
+ifdef SHARED

+EXT=dll

+else

+EXT=a

+endif

diff --git a/externals/grill/flext/buildsys/win/pd/make-mingw.inc b/externals/grill/flext/buildsys/win/pd/gnumake-mingw.inc
index 836ef3b6..1002a914 100644
--- a/externals/grill/flext/buildsys/win/pd/make-mingw.inc
+++ b/externals/grill/flext/buildsys/win/pd/gnumake-mingw.inc
@@ -5,5 +5,3 @@ LIBPATH += -L$(PDPATH)/bin
 
 # these are both in PDPATH
 LIBS += -lpd -lpthreadVC
-
-EXT=dll
diff --git a/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc b/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc
new file mode 100644
index 00000000..b2234c5b
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/nmake-msvc-ext.inc
@@ -0,0 +1 @@
+EXT=dll

diff --git a/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc b/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc
new file mode 100644
index 00000000..a080ae72
--- /dev/null
+++ b/externals/grill/flext/buildsys/win/pd/nmake-msvc-flext.inc
@@ -0,0 +1,5 @@
+!ifdef SHARED

+EXT=dll

+!else

+EXT=lib

+!endif

diff --git a/externals/grill/flext/buildsys/win/pd/make-msvc.inc b/externals/grill/flext/buildsys/win/pd/nmake-msvc.inc
index 41a7cd30..75a99d4b 100644
--- a/externals/grill/flext/buildsys/win/pd/make-msvc.inc
+++ b/externals/grill/flext/buildsys/win/pd/nmake-msvc.inc
@@ -5,5 +5,3 @@ LIBPATH=$(LIBPATH) /LIBPATH:$(PDPATH)\bin
 
 # these are both in PDPATH
 LIBS=$(LIBS) pd.lib pthreadVC.lib
-
-EXT=dll