""

svn path=/trunk/; revision=1218

9 files changed, 21 insertions, 6 deletions

diff --git a/externals/grill/flext/changes.txt b/externals/grill/flext/changes.txt
index 4c0eca4b..c3ef647e 100644
--- a/externals/grill/flext/changes.txt
+++ b/externals/grill/flext/changes.txt
@@ -13,7 +13,7 @@ Donations for further development of the package are highly appreciated.
 
 Version history:
 
-0.5.0:
+0.4.5:
 - added some more SIMD functions
 - PD attributes: added a TCL/TK editor dialog ("properties") and save attributes to patcher
 - fixed wrong returned result of flext::buffer::set function
diff --git a/externals/grill/flext/flext.doxy b/externals/grill/flext/flext.doxy
index 46f973d6..db240640 100644
--- a/externals/grill/flext/flext.doxy
+++ b/externals/grill/flext/flext.doxy
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = flext
-PROJECT_NUMBER         = "version 0.5.0"
+PROJECT_NUMBER         = "version 0.4.5"
 OUTPUT_DIRECTORY       = f:/prog/max/flext/doc/
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = YES
diff --git a/externals/grill/flext/make-inc.max-msvc b/externals/grill/flext/make-inc.max-msvc
index 149428d5..54d0d479 100644
--- a/externals/grill/flext/make-inc.max-msvc
+++ b/externals/grill/flext/make-inc.max-msvc
@@ -6,6 +6,8 @@
 
 !include config-max-msvc.txt
 
+NAME=flext
+
 # source files
 SOURCE=source
 
diff --git a/externals/grill/flext/make-inc.pd-msvc b/externals/grill/flext/make-inc.pd-msvc
index 4dc5ce50..5aa431f6 100644
--- a/externals/grill/flext/make-inc.pd-msvc
+++ b/externals/grill/flext/make-inc.pd-msvc
@@ -6,6 +6,8 @@
 
 !include config-pd-msvc.txt
 
+NAME=flext
+
 # source files
 SOURCE=source
 
diff --git a/externals/grill/flext/makefile.pd-cygwin b/externals/grill/flext/makefile.pd-cygwin
index c7d8b472..5c7d5ddf 100644
--- a/externals/grill/flext/makefile.pd-cygwin
+++ b/externals/grill/flext/makefile.pd-cygwin
@@ -20,7 +20,7 @@ include $(CONFIG)
 INCLUDES=/usr/include $(PDPATH)/src 
 
 FLAGS=-DFLEXT_SYS=2 $(UFLAGS)
-CFLAGS=-O6 
+CFLAGS=-O2
 CFLAGS_D=-g
 CFLAGS_T=-DFLEXT_THREADS
 LIBS=
diff --git a/externals/grill/flext/source/flatom_pr.cpp b/externals/grill/flext/source/flatom_pr.cpp
index a77374b9..10eaa54b 100644
--- a/externals/grill/flext/source/flatom_pr.cpp
+++ b/externals/grill/flext/source/flatom_pr.cpp
@@ -49,7 +49,7 @@ bool flext::PrintAtom(const t_atom &a,char *buf,int bufsz)
 //#pragma message("Not implemented")
 #endif
 	else {
-		ERRINTERNAL();
+        error("flext: atom type unknown");
 		ok = false;
 	}
 	return ok;
diff --git a/externals/grill/flext/source/flext.h b/externals/grill/flext/source/flext.h
index c18fd29c..47f15ec1 100644
--- a/externals/grill/flext/source/flext.h
+++ b/externals/grill/flext/source/flext.h
@@ -23,10 +23,10 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 */
 
 //! \brief flext version number
-#define FLEXT_VERSION 500
+#define FLEXT_VERSION 405
 
 //! \brief flext version string
-#define FLEXT_VERSTR "0.5.0pre"
+#define FLEXT_VERSTR "0.4.5"
 
 //! @}
 
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index 283466ac..c964c66e 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -69,6 +69,10 @@ public:
 	//!	@}  FLEXT_S_MEMORY  	
 };
 
+// at the moment it's a real problem that global overloading of allocators
+// clashes with MFC (e.g. in vst~)
+// therefore... try to think over it
+#if 0 
 
 #if !defined(_MSC_VER) && !defined(__BORLANDC__)
 #define NEWTHROW throw(std::bad_alloc)
@@ -86,6 +90,8 @@ inline void *operator new[](size_t bytes) NEWTHROW { return flext_root::operator
 inline void operator delete[](void *blk) DELTHROW { flext_root::operator delete[](blk); }
 #endif
 
+#endif
+
 
 class FLEXT_SHARE FLEXT_CLASSDEF(flext);
 typedef class FLEXT_CLASSDEF(flext) flext;
diff --git a/externals/grill/flext/source/flthr.cpp b/externals/grill/flext/source/flthr.cpp
index 65fd4c3b..082fd161 100644
--- a/externals/grill/flext/source/flthr.cpp
+++ b/externals/grill/flext/source/flthr.cpp
@@ -27,6 +27,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #include <sys/timeb.h>
 #endif
 
+#if FLEXT_THREADS == FLEXT_THR_WIN32 && WINVER < 0x0500
+#error WIN32 threads need Windows SDK version >= 0x500
+#endif
+
+
 #include <errno.h>
 
 //! Thread id of system thread