diff options
author | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-25 04:52:21 +0000 |
---|---|---|
committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-03-25 04:52:21 +0000 |
commit | 03df01d81c2db0c7234833fce06fcdd7f0aae8e0 (patch) | |
tree | 5535f3040ff277459878342f556c6ccb9cf558e0 /externals | |
parent | 848cad880af05c8c1153c21503d434eaaf8eab95 (diff) |
optimized AtomList functions
minor fixes for Max
fixes for OSX
small update of linkage styles etc.
updated the docs
new: FLEXT_WARN, FLEXT_ERROR macros
svn path=/trunk/; revision=2642
Diffstat (limited to 'externals')
-rw-r--r-- | externals/grill/flext/build.txt | 25 | ||||
-rw-r--r-- | externals/grill/flext/flext.vcproj | 137 | ||||
-rw-r--r-- | externals/grill/flext/source/flmap.h | 6 | ||||
-rw-r--r-- | externals/grill/flext/source/flsupport.cpp | 12 |
4 files changed, 28 insertions, 152 deletions
diff --git a/externals/grill/flext/build.txt b/externals/grill/flext/build.txt index e489a085..35baf4de 100644 --- a/externals/grill/flext/build.txt +++ b/externals/grill/flext/build.txt @@ -9,7 +9,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. This document consists of the following parts: 1) Using the flext build system -1.1) Building flext +1.1) Building and installing flext 1.2) Building externals 1.3) Tested configurations @@ -77,8 +77,8 @@ See buildsys/readme.txt for developer-centered information. -1.1) Building flext -=================== +1.1) Building and installing flext +================================== Flext can build itself using the build system. From the flext main directory, run the build script @@ -92,11 +92,24 @@ When you run it for the first time, one or more configuration files will be crea from templates - you will get a message on the console. You should edit the files to adapt it to your system. -Then install flext with (under Windows) +Depending on your platform these will have name like +buildsys/config-win-pd-msvc.txt +or +buildsys/config-lnx-pd-gcc.txt +or +buildsys/config-mac-max-gcc.txt + + + +After successfully building everything, you can install flext with (under Windows) build pd msvc install or (under unix) bash build.sh pd gcc install +You will probably have to have superuser rights in order to install things +into the default location. +(try "sudo" or "su -c" prefixes, or log in as root) + 1.2) Building externals ======================= @@ -122,8 +135,8 @@ You can clean up the intermediate build folders with bash ../flext/build.sh pd gcc clean -1.3) Building externals -======================= +1.3) Tested configurations +========================== Both flext and flext-based externals have been successfully built with the following combination of platform-system-compiler, build type. diff --git a/externals/grill/flext/flext.vcproj b/externals/grill/flext/flext.vcproj index 14ac8344..19e5986f 100644 --- a/externals/grill/flext/flext.vcproj +++ b/externals/grill/flext/flext.vcproj @@ -950,143 +950,6 @@ copy F:\prog\max\flext\max-msvc\flext.max.dll f:\prog\dll </FileConfiguration> </File> <File - RelativePath="source\flatom_app.cpp"> - <FileConfiguration - Name="Threads DLL Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Threads DLL Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="PD Threads Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="PD Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="PD Threads Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="PD Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="PD Shared Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="PD Shared Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Shared Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Shared Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Threaded Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Threaded Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - </File> - <File RelativePath="source\flatom_part.cpp"> <FileConfiguration Name="Threads DLL Debug|Win32"> diff --git a/externals/grill/flext/source/flmap.h b/externals/grill/flext/source/flmap.h index 50c81b20..bcf67c46 100644 --- a/externals/grill/flext/source/flmap.h +++ b/externals/grill/flext/source/flmap.h @@ -94,8 +94,8 @@ protected: void *value; }; - TableAnyMap(TableAnyMap *p,int mx,Data *dt,bool o) - : owned(o),max(mx),data(dt) + TableAnyMap(TableAnyMap *p,int sz,Data *dt,bool o) + : owned(o),tsize(sz),data(dt) , n(0),parent(p),left(NULL),right(NULL) {} @@ -143,7 +143,7 @@ protected: void *_find(size_t k); const bool owned; - const int max; + const int tsize; Data *const data; int n; TableAnyMap *parent,*left,*right; diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp index 004e8627..53821157 100644 --- a/externals/grill/flext/source/flsupport.cpp +++ b/externals/grill/flext/source/flsupport.cpp @@ -321,7 +321,7 @@ void TableAnyMap::clear() int TableAnyMap::size() const { int sz = n; - if(sz >= max) { + if(sz >= tsize) { if(left) sz += left->size(); if(right) sz += right->size(); } @@ -332,14 +332,14 @@ void TableAnyMap::_set(size_t k,void *t) { FLEXT_ASSERT(n); - if(n < max) { + if(n < tsize) { // fall through } else if(k < data[0].key) { _toleft(k,t); return; } - else if(k > data[max-1].key) { + else if(k > data[tsize-1].key) { _toright(k,t); return; } @@ -379,8 +379,8 @@ void TableAnyMap::_set(size_t k,void *t) else { // insert new slot by shifting the higher ones FLEXT_ASSERT(k < dk); - if(n == max) - _toright(data[max-1]); + if(n == tsize) + _toright(data[tsize-1]); else ++n; @@ -393,7 +393,7 @@ void TableAnyMap::_set(size_t k,void *t) void *TableAnyMap::_find(size_t k) { FLEXT_ASSERT(n); - if(n < max) { + if(n < tsize) { // fall through } else if(k < data[0].key) |