diff options
Diffstat (limited to 'externals/grill')
| -rw-r--r-- | externals/grill/flext/flext.vcproj | 8 | ||||
| -rw-r--r-- | externals/grill/flext/readme.txt | 4 | ||||
| -rw-r--r-- | externals/grill/flext/source/flattr_ed.cpp | 10 | ||||
| -rwxr-xr-x | externals/grill/flext/source/flprefix.h | 15 | ||||
| -rw-r--r-- | externals/grill/flext/source/flstdc.h | 22 | ||||
| -rw-r--r-- | externals/grill/flext/source/flsupport.h | 2 |
6 files changed, 37 insertions, 24 deletions
diff --git a/externals/grill/flext/flext.vcproj b/externals/grill/flext/flext.vcproj index 121ba62c..8de53159 100644 --- a/externals/grill/flext/flext.vcproj +++ b/externals/grill/flext/flext.vcproj @@ -124,7 +124,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" + AdditionalIncludeDirectories="c:\programme\audio\pd-0.37\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -174,7 +174,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" + AdditionalIncludeDirectories="c:\programme\audio\pd-0.37\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -225,7 +225,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" + AdditionalIncludeDirectories="c:\programme\audio\pd-0.37\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_USE_SIMD" StringPooling="TRUE" RuntimeLibrary="0" @@ -275,7 +275,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" + AdditionalIncludeDirectories="c:\programme\audio\pd-0.37\src,f:\prog\audio\sndobj\include,f:\prog\audio\stk\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD" StringPooling="TRUE" RuntimeLibrary="4" diff --git a/externals/grill/flext/readme.txt b/externals/grill/flext/readme.txt index 132b6d08..0574356c 100644 --- a/externals/grill/flext/readme.txt +++ b/externals/grill/flext/readme.txt @@ -66,7 +66,7 @@ Max/MSP - MacOS 9: ------------------ o Metrowerks CodeWarrior: edit & use the "flext.cw" project file -You must have the following "Source Trees" defined: +You must have the following "Source Trees" (CW preferences, not project specific!) defined: "flext" - Pointing to the flext main directory "Cycling74" - Pointing to the Cycling 74 SDK "MP SDK" - Pointing to the Multiprocessing SDK (for threading support) @@ -80,7 +80,7 @@ Max/MSP - MacOSX: ------------------ o Metrowerks CodeWarrior: edit & use the "flext.cw" project file -You must have the following "Source Trees" defined: +You must have the following "Source Trees" (CW preferences, not project specific!) defined: "OS X Volume" - Pointing to your OSX boot drive "flext" - Pointing to the flext main directory "Cycling74 OSX" - Pointing to the Cycling 74 SDK for xmax diff --git a/externals/grill/flext/source/flattr_ed.cpp b/externals/grill/flext/source/flattr_ed.cpp index a75e3715..c147fbe4 100644 --- a/externals/grill/flext/source/flattr_ed.cpp +++ b/externals/grill/flext/source/flattr_ed.cpp @@ -61,11 +61,17 @@ void flext_base::SetAttrEditor(t_classid c) widgetbehavior.w_deletefn = text_widgetbehavior.w_deletefn; widgetbehavior.w_clickfn = text_widgetbehavior.w_clickfn; #endif - widgetbehavior.w_propertiesfn = cb_GfxProperties; - widgetbehavior.w_savefn = cb_GfxSave; + widgetbehavior.w_visfn = cb_GfxVis; class_setwidget(c, &widgetbehavior); +#if PD_MINOR_VERSION >= 37 + class_setpropertiesfn(c,cb_GfxProperties); + class_setsavefn(c,cb_GfxSave); +#else + widgetbehavior.w_propertiesfn = cb_GfxProperties; + widgetbehavior.w_savefn = cb_GfxSave; +#endif // generate the script for the property dialog diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h index e9e43e50..93bfbe4d 100755 --- a/externals/grill/flext/source/flprefix.h +++ b/externals/grill/flext/source/flprefix.h @@ -342,21 +342,6 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif #endif -// ----- set message queue mode ----- -#undef FLEXT_QTHR - -#ifdef FLEXT_PDLOCK - // new PD thread locking functionality shall be used - #if FLEXT_SYS == FLEXT_SYS_PD - #ifdef FLEXT_THREADS - // can only be used with PD and threaded build - #define FLEXT_QTHR - #endif - #else - #error FLEXT_PDLOCK can only be defined with PD - #endif -#endif - // ----- macros for class names ----- /* With linux (flat linker namespace) and more than one flext-based external loaded all calls to static diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h index 36fe8e15..fc51e890 100644 --- a/externals/grill/flext/source/flstdc.h +++ b/externals/grill/flext/source/flstdc.h @@ -236,4 +236,26 @@ typedef t_symbol *t_symptr; #endif +// ----- set message queue mode ----- +#undef FLEXT_QTHR + +#if FLEXT_SYS == FLEXT_SYS_PD && PD_MINOR_VERSION >= 37 + // for PD version >= 0.37test10 FLEXT_PDLOCK is standard + #undef FLEXT_PDLOCK + #define FLEXT_PDLOCK +#endif + +#ifdef FLEXT_PDLOCK + // new PD thread locking functionality shall be used + #if FLEXT_SYS == FLEXT_SYS_PD + #ifdef FLEXT_THREADS + // can only be used with PD and threaded build + #define FLEXT_QTHR + #endif + #else + #error FLEXT_PDLOCK can only be defined with PD + #endif +#endif + + #endif diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index c2eaa18f..c4331df4 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -92,7 +92,7 @@ public: //! Free an aligned memory block static void FreeAligned(void *blk); //! Test for alignment - static bool IsAligned(void *ptr,int bitalign = 128) { return (reinterpret_cast<unsigned long>(ptr)&(bitalign-1)) == 0; } + static bool IsAligned(void *ptr,int bitalign = 128) { return (reinterpret_cast<unsigned long long>(ptr)&(bitalign-1)) == 0; } //! @} FLEXT_S_MEMORY |