aboutsummaryrefslogtreecommitdiff
path: root/externals/grill
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill')
-rw-r--r--externals/grill/flext/flext.cwbin509213 -> 572167 bytes
-rw-r--r--externals/grill/flext/readme.txt3
-rwxr-xr-xexternals/grill/flext/source/flcwmax-x.h1
-rwxr-xr-xexternals/grill/flext/source/flcwpd-x-thr.h31
-rwxr-xr-xexternals/grill/flext/source/flcwpd-x.h36
-rw-r--r--externals/grill/flext/source/fldoxygen.h2
-rwxr-xr-xexternals/grill/flext/source/flprefix.h11
-rw-r--r--externals/grill/flext/source/flutil.cpp2
-rw-r--r--externals/grill/xsample/source/main.h2
-rwxr-xr-xexternals/grill/xsample/xsample.cwbin213671 -> 278705 bytes
10 files changed, 83 insertions, 5 deletions
diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw
index 0776b509..e35219e5 100644
--- a/externals/grill/flext/flext.cw
+++ b/externals/grill/flext/flext.cw
Binary files differ
diff --git a/externals/grill/flext/readme.txt b/externals/grill/flext/readme.txt
index 32d783d5..362d7a47 100644
--- a/externals/grill/flext/readme.txt
+++ b/externals/grill/flext/readme.txt
@@ -114,6 +114,9 @@ see flext.h, fldefs.h and flclass.h for the documented base definitions and clas
Version history:
+0.4.4:
+- some fixes for CodeWarrior Mach-O compilation
+
0.4.3:
- added forgotten flext_base::ToQueueString method
- added timer functions and flext::Timer class
diff --git a/externals/grill/flext/source/flcwmax-x.h b/externals/grill/flext/source/flcwmax-x.h
index bffff8d3..eec2aa7e 100755
--- a/externals/grill/flext/source/flcwmax-x.h
+++ b/externals/grill/flext/source/flcwmax-x.h
@@ -17,6 +17,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#define TARGET_API_MAC_CARBON 1
#define _POSIX_C_SOURCE
+#define _POSIX_SOURCE
#include "flcwmax.h"
diff --git a/externals/grill/flext/source/flcwpd-x-thr.h b/externals/grill/flext/source/flcwpd-x-thr.h
new file mode 100755
index 00000000..56a193ef
--- /dev/null
+++ b/externals/grill/flext/source/flcwpd-x-thr.h
@@ -0,0 +1,31 @@
+/*
+
+flext - C++ layer for Max/MSP and pd (pure data) externals
+
+Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+For information on usage and redistribution, and for a DISCLAIMER OF ALL
+WARRANTIES, see the file, "license.txt," in this distribution.
+
+*/
+
+/* This is the prefix file for CodeWarrior projects - OS X version */
+
+#ifndef _FLEXT_CW_PD_X_THR_H
+#define _FLEXT_CW_PD_X_THR_H
+
+#define FLEXT_THREADS
+
+#if 0
+/*
+ old CodeWarrior version (<= 6) don't have sigset_t defined which
+ is needed for pthreads
+*/
+#if defined(__MWERKS__) && (__MWERKS__ <= 0x6000)
+ typedef unsigned int sigset_t;
+ #define _CW_NOPRECOMP // no precompiled headers
+#endif
+#endif
+
+#include "flcwpd-x.h"
+
+#endif
diff --git a/externals/grill/flext/source/flcwpd-x.h b/externals/grill/flext/source/flcwpd-x.h
new file mode 100755
index 00000000..3d7256f1
--- /dev/null
+++ b/externals/grill/flext/source/flcwpd-x.h
@@ -0,0 +1,36 @@
+/*
+
+flext - C++ layer for Max/MSP and pd (pure data) externals
+
+Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+For information on usage and redistribution, and for a DISCLAIMER OF ALL
+WARRANTIES, see the file, "license.txt," in this distribution.
+
+*/
+
+/* This is the prefix file for CodeWarrior projects - OS X version */
+
+#ifndef _FLEXT_CW_PD_X_H
+#define _FLEXT_CW_PD_X_H
+
+#ifndef __MWERKS__
+ #error "This header file is for CodeWarrior only."
+#endif
+
+#define FLEXT_SYS 2
+
+#define TARGET_API_MAC_CARBON 1
+#define _POSIX_C_SOURCE
+
+#ifndef _CW_NOPRECOMP
+// #include <MacHeadersMach-O.h>
+// #include <MSL MacHeadersMach-O.h>
+#endif
+
+#if __option(sym) || !__option(opt_dead_code)
+ #define FLEXT_DEBUG
+#endif
+
+/* #define _LOG */
+
+#endif
diff --git a/externals/grill/flext/source/fldoxygen.h b/externals/grill/flext/source/fldoxygen.h
index d3574842..1bfef48e 100644
--- a/externals/grill/flext/source/fldoxygen.h
+++ b/externals/grill/flext/source/fldoxygen.h
@@ -47,7 +47,7 @@ Currently, flext supports
<ul>
<li>PD on Windows with Microsoft Visual C++, Borland C++ and gcc(cygwin) compilers
<li>PD on Linux with gcc
-<li>PD on Mac OSX with gcc (Project Builder to follow soon)
+<li>PD on Mac OSX with gcc (makefile or Project Builder)
<li>Max/MSP on Mac OS9 and OSX with Metrowerks CodeWarrior
</ul>
diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h
index 028c8df9..6c2e2999 100755
--- a/externals/grill/flext/source/flprefix.h
+++ b/externals/grill/flext/source/flprefix.h
@@ -141,8 +141,15 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#elif defined(__MWERKS__)
// Metrowerks CodeWarrior
- #ifndef __CONDITIONALMACROS__
- #include <ConditionalMacros.h>
+ #ifdef __MACH__
+ // quick fix for OSX Mach-O
+ #define TARGET_CPU_PPC 1
+ #define TARGET_OS_MAC 1
+ #define TARGET_API_MAC_OSX 1
+ #else
+ #ifndef __CONDITIONALMACROS__
+ #include <ConditionalMacros.h>
+ #endif
#endif
#ifndef FLEXT_CPU
diff --git a/externals/grill/flext/source/flutil.cpp b/externals/grill/flext/source/flutil.cpp
index 5d9b20d7..5081c245 100644
--- a/externals/grill/flext/source/flutil.cpp
+++ b/externals/grill/flext/source/flutil.cpp
@@ -18,7 +18,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#if FLEXT_OS == FLEXT_OS_WIN
#include <windows.h>
#elif FLEXT_OS == FLEXT_OS_MAC
- #ifdef __MWERKS__
+ #if FLEXT_OSAPI != FLEXT_OSAPI_MAC_OSX
#include <MacMemory.h>
#else
#include <Carbon/Carbon.h>
diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h
index 2bbe71c7..bff42b7d 100644
--- a/externals/grill/xsample/source/main.h
+++ b/externals/grill/xsample/source/main.h
@@ -60,7 +60,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#define S t_sample
-#ifdef __MWERKS__
+#if defined(__MWERKS__) && !defined(__MACH__)
#define STD std
#else
#define STD
diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw
index 3f58cdee..7e26972f 100755
--- a/externals/grill/xsample/xsample.cw
+++ b/externals/grill/xsample/xsample.cw
Binary files differ