From 55fcd829cd66c6482ca5d2524c11f49e3ba883cf Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Mon, 29 May 2006 10:19:27 +0000 Subject: more robust structure pack setting for Max/MSP @ Windows attribute generation is now determined exclusively by the object class setup (not library as before). some minor changes after valgrind run - preprocessor symbol FLEXT_COMPATIBLE - if defined don't implement specialities of either PD or Max/MSP fixed bug for Max/MSP when there's no signal inlet - Max: fixed reported bug (#67), where list elements are distributed over inlets svn path=/trunk/; revision=5148 --- externals/grill/flext/changes.txt | 1 + externals/grill/flext/flext.vcproj | 20 ++++------------- externals/grill/flext/source/fldsp.h | 8 ++++++- externals/grill/flext/source/flext.h | 11 ---------- externals/grill/flext/source/flstdc.h | 41 +++++++++-------------------------- 5 files changed, 22 insertions(+), 59 deletions(-) (limited to 'externals') diff --git a/externals/grill/flext/changes.txt b/externals/grill/flext/changes.txt index 011a607c..7411357d 100644 --- a/externals/grill/flext/changes.txt +++ b/externals/grill/flext/changes.txt @@ -33,6 +33,7 @@ Version history: - added thisParent type, which refers to the class from which the current flext class is derived (as given in FLEXT_HEADER) - bang method can also by added with FLEXT_(C)ADDMETHOD (FLEXT_(C)ADDBANG is still an alias) - attribute generation is now determined exclusively by each object class setup (not library is before) +- more robust pack setting for Max/MSP @ Windows 0.5.0: - fixes for 64 bit builds (size_t is integer type of pointer size) diff --git a/externals/grill/flext/flext.vcproj b/externals/grill/flext/flext.vcproj index b65507d9..685b2db7 100644 --- a/externals/grill/flext/flext.vcproj +++ b/externals/grill/flext/flext.vcproj @@ -690,11 +690,10 @@ copy F:\prog\max\flext\max-msvc\flext.max.dll f:\prog\dll InlineFunctionExpansion="0" FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" - AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_MAX;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS;_WIN32_WINNT=0x501" + AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk\c74support\max-includes";"C:\data\prog\audio\maxmspsdk\c74support\msp-includes";c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=1;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS;_WIN32_WINNT=0x501" StringPooling="TRUE" RuntimeLibrary="1" - StructMemberAlignment="2" EnableEnhancedInstructionSet="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" @@ -745,11 +744,10 @@ copy F:\prog\max\flext\max-msvc\flext.max.dll f:\prog\dll InlineFunctionExpansion="2" FavorSizeOrSpeed="0" EnableFiberSafeOptimizations="FALSE" - AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" - PreprocessorDefinitions="WIN32;_LIB;FLEXT_SYS_MAX;FLEXT_USE_SIMD;FLEXT_EXPORTS;FLEXT_THREADS" + AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk\c74support\max-includes";"C:\data\prog\audio\maxmspsdk\c74support\msp-includes";c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" + PreprocessorDefinitions="WIN32;_LIB;FLEXT_SYS=1;FLEXT_USE_SIMD;FLEXT_EXPORTS;FLEXT_THREADS;_WIN32_WINNT=0x502" StringPooling="TRUE" RuntimeLibrary="0" - StructMemberAlignment="2" EnableEnhancedInstructionSet="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" @@ -1920,7 +1918,6 @@ copy F:\prog\max\flext\max-msvc\flext.max.dll f:\prog\dll Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" BrowseInformation="1"/> - - // undefine them again - #undef typeid - #undef template - #undef this - #undef class -} - -typedef fts_dsp_object t_sigobj; -typedef void t_canvas; // decide type later on - -typedef char t_symbol; -typedef fts_atom_t t_atom; -typedef fts_class_t t_class; -typedef float t_sample; // is there no sample type in jMax? - -typedef fts_timebase_entry_t t_clock; -typedef fts_timebase_entry_t t_qelem; +#ifdef _MSC_VER +#pragma pack(pop,flext_maxsdk) +#endif +#else +#error Platform not supported #endif // FLEXT_SYS -- cgit v1.2.1