aboutsummaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
Diffstat (limited to 'externals')
-rw-r--r--externals/grill/flext/flext.cwbin897507 -> 935395 bytes
-rwxr-xr-xexternals/grill/flext/source/flcwmax-thr.h2
-rwxr-xr-xexternals/grill/flext/source/flcwmax-x-thr.h2
-rwxr-xr-xexternals/grill/flext/source/flcwmax-x.h2
-rwxr-xr-xexternals/grill/flext/source/flprefix.h2
-rw-r--r--externals/grill/flext/source/flstdc.h7
-rw-r--r--externals/grill/flext/source/flsupport.cpp10
-rwxr-xr-xexternals/grill/flext/source/fltimer.cpp4
8 files changed, 18 insertions, 11 deletions
diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw
index 2d6608c8..1601cd6c 100644
--- a/externals/grill/flext/flext.cw
+++ b/externals/grill/flext/flext.cw
Binary files differ
diff --git a/externals/grill/flext/source/flcwmax-thr.h b/externals/grill/flext/source/flcwmax-thr.h
index b3ef6edb..2e883dbe 100755
--- a/externals/grill/flext/source/flcwmax-thr.h
+++ b/externals/grill/flext/source/flcwmax-thr.h
@@ -21,7 +21,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
old CodeWarrior version (<= 6) don't have sigset_t defined which
is needed for pthreads
*/
-#if defined(__MWERKS__) && (__MWERKS__ <= 0x6000)
+#if defined(__MWERKS__) && (__MWERKS__ == 1) // read __MWERKS__ numbering starts with CW7
typedef unsigned int sigset_t;
#define _CW_NOPRECOMP // no precompiled headers
#endif
diff --git a/externals/grill/flext/source/flcwmax-x-thr.h b/externals/grill/flext/source/flcwmax-x-thr.h
index 0d2d8b3d..e737ff19 100755
--- a/externals/grill/flext/source/flcwmax-x-thr.h
+++ b/externals/grill/flext/source/flcwmax-x-thr.h
@@ -21,7 +21,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
old CodeWarrior version (<= 6) don't have sigset_t defined which
is needed for pthreads
*/
-#if defined(__MWERKS__) && (__MWERKS__ <= 0x6000)
+#if defined(__MWERKS__) && (__MWERKS__ == 1) // read __MWERKS__ numbering starts with CW7
typedef unsigned int sigset_t;
#define _CW_NOPRECOMP // no precompiled headers
#endif
diff --git a/externals/grill/flext/source/flcwmax-x.h b/externals/grill/flext/source/flcwmax-x.h
index eec2aa7e..e1e340d2 100755
--- a/externals/grill/flext/source/flcwmax-x.h
+++ b/externals/grill/flext/source/flcwmax-x.h
@@ -15,7 +15,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#ifndef _FLEXT_CW_MAX_X_H
#define _FLEXT_CW_MAX_X_H
-#define TARGET_API_MAC_CARBON 1
+//#define TARGET_API_MAC_CARBON 1
#define _POSIX_C_SOURCE
#define _POSIX_SOURCE
diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h
index 7b39af88..a61ec8d7 100755
--- a/externals/grill/flext/source/flprefix.h
+++ b/externals/grill/flext/source/flprefix.h
@@ -189,9 +189,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#ifndef FLEXT_OSAPI
#if TARGET_API_MAC_MACH
+ // this is for Mach-O
// this has the precedence (MACH also supports Carbon, of course)
#define FLEXT_OSAPI FLEXT_OSAPI_MAC_MACH
#elif TARGET_API_MAC_CARBON
+ // this is for CFM
#define FLEXT_OSAPI FLEXT_OSAPI_MAC_CARBON
#else
#define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN
diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h
index f55b362b..402ce01a 100644
--- a/externals/grill/flext/source/flstdc.h
+++ b/externals/grill/flext/source/flstdc.h
@@ -97,6 +97,7 @@ typedef t_clock t_qelem;
#define WIN_VERSION 1
#endif
+
#include "ext.h"
#include "ext_user.h"
#include "z_dsp.h"
@@ -111,7 +112,11 @@ typedef t_int t_flint;
typedef t_symbol *t_symtype;
typedef t_object *t_thing;
-typedef void *t_qelem;
+#if FLEXT_OS == FLEXT_OS_WIN
+typedef void *t_qelem; // qelem not defined in Windows SDK
+#else
+typedef qelem t_qelem;
+#endif
typedef method t_method;
typedef method t_newmethod;
diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp
index c453aae2..1af2ab09 100644
--- a/externals/grill/flext/source/flsupport.cpp
+++ b/externals/grill/flext/source/flsupport.cpp
@@ -143,7 +143,7 @@ void *flext_root::operator new(size_t bytes)
char *blk;
if(bytes >= LARGEALLOC) {
-#if FLEXT_SYS == FLEXT_SYS_MAX
+#if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
blk = (char *)::sysmem_newptr(bytes);
#else
// use C library function for large memory blocks
@@ -176,7 +176,7 @@ void flext_root::operator delete(void *blk)
size_t bytes = *(size_t *)ori;
if(bytes >= LARGEALLOC) {
-#if FLEXT_SYS == FLEXT_SYS_MAX
+#if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
::sysmem_freeptr(ori);
#else
// use C library function for large memory blocks
@@ -204,7 +204,7 @@ void *flext_root::NewAligned(size_t bytes,int bitalign)
char *blk;
if(bytes >= LARGEALLOC) {
-#if FLEXT_SYS == FLEXT_SYS_MAX
+#if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
blk = (char *)::sysmem_newptr(bytes);
#else
// use C library function for large memory blocks
@@ -238,7 +238,7 @@ void flext_root::FreeAligned(void *blk)
size_t bytes = *(size_t *)((char *)blk-sizeof(size_t));
if(bytes >= LARGEALLOC) {
-#if FLEXT_SYS == FLEXT_SYS_MAX
+#if FLEXT_SYS == FLEXT_SYS_MAX && defined(_SYSMEM_H_)
::sysmem_freeptr(ori);
#else
// use C library function for large memory blocks
@@ -303,7 +303,7 @@ void flext_root::error(const char *fmt,...)
va_start(ap, fmt);
char buf[1024];
- strcpy(buf,"error: ");
+ STD::strcpy(buf,"error: ");
vsnprintf(buf+7,sizeof buf-7,fmt, ap);
buf[sizeof buf-1] = 0; // in case of full buffer
::post(buf);
diff --git a/externals/grill/flext/source/fltimer.cpp b/externals/grill/flext/source/fltimer.cpp
index dffe1eb6..3ce05ed9 100755
--- a/externals/grill/flext/source/fltimer.cpp
+++ b/externals/grill/flext/source/fltimer.cpp
@@ -133,7 +133,7 @@ flext::Timer::~Timer()
clock_free(clk);
#elif FLEXT_SYS == FLEXT_SYS_MAX
clock_free(clk);
- if(queued) qelem_free(qelem);
+ if(queued) ::qelem_free(qelem);
#else
#error Not implemented
#endif
@@ -145,7 +145,7 @@ bool flext::Timer::Reset()
clock_unset(clk);
#elif FLEXT_SYS == FLEXT_SYS_MAX
clock_unset(clk);
- if(queued) qelem_unset(qelem);
+ if(queued) ::qelem_unset(qelem);
#else
#error Not implemented
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 03:34:50 +0000