aboutsummaryrefslogtreecommitdiff
path: root/externals/grill
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill')
-rw-r--r--externals/grill/vasp/changes.txt1
-rw-r--r--externals/grill/vasp/readme.txt2
-rwxr-xr-xexternals/grill/vasp/source/oploop.h17
-rw-r--r--externals/grill/vasp/vasp.vcproj4
4 files changed, 9 insertions, 15 deletions
diff --git a/externals/grill/vasp/changes.txt b/externals/grill/vasp/changes.txt
index 8a8172eb..933ebf2c 100644
--- a/externals/grill/vasp/changes.txt
+++ b/externals/grill/vasp/changes.txt
@@ -2,6 +2,7 @@ Version history:
0.1.4:
- FIX: resurrect help message-functionality and add some missing help texts
+- FIX: break condition for some loop constructs (thanks to Patrick King)
0.1.3:
- CHANGE: exchanged #defines for templates in vector calculation loops
diff --git a/externals/grill/vasp/readme.txt b/externals/grill/vasp/readme.txt
index e186b281..a8af0785 100644
--- a/externals/grill/vasp/readme.txt
+++ b/externals/grill/vasp/readme.txt
@@ -1,7 +1,7 @@
VASP modular - vector assembling signal processor
Object library for Max/MSP and PD
-Copyright (c) 2002-2005 Thomas Grill (gr@grrrr.org)
+Copyright (c) 2002-2006 Thomas Grill (gr@grrrr.org)
For information on usage and redistribution, and for a DISCLAIMER OF ALL
WARRANTIES, see the file, "license.txt," in this distribution.
diff --git a/externals/grill/vasp/source/oploop.h b/externals/grill/vasp/source/oploop.h
index 9518edf1..ec805c13 100755
--- a/externals/grill/vasp/source/oploop.h
+++ b/externals/grill/vasp/source/oploop.h
@@ -2,7 +2,7 @@
VASP modular - vector assembling signal processor / objects for Max/MSP and PD
-Copyright (c) 2002 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2002-2006 Thomas Grill (gr@grrrr.org)
For information on usage and redistribution, and for a DISCLAIMER OF ALL
WARRANTIES, see the file, "license.txt," in this distribution.
@@ -16,20 +16,13 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#define _D_MIN(a,b) ((a) < (b)?(a):(b))
#ifdef FLEXT_THREADS
-/*
- #define _D_LOOP(VAR,LEN) { \
- register I __i__; \
- for(__i__ = 0; __i__ < LEN; flext_base::ThrYield()) { \
- I __m__ = _D_MIN(LEN,__i__+_D_BLOCK); for(; (VAR = __i__) < __m__; ++__i__) {
- #define _E_LOOP } if(__i__ < __m__) break; }}
-*/
#define _D_LOOP(VAR,LEN) { \
- for(VAR = 0; VAR < LEN; flext_base::ThrYield()) { \
- register const I __m__ = _D_MIN(LEN,VAR+_D_BLOCK); \
- for(; VAR < __m__; ++VAR) {
+ for(register int __i__ = 0; __i__ < LEN; flext_base::ThrYield()) { \
+ register const I __m__ = _D_MIN(LEN,__i__+_D_BLOCK); \
+ for(; __i__ < __m__; ++__i__) { VAR = __i__;
- #define _E_LOOP }}}
+ #define _E_LOOP } if(__i__ < __m__) break; }}
#define _D_WHILE(COND) { \
for(; (COND) ; flext_base::ThrYield()) { \
diff --git a/externals/grill/vasp/vasp.vcproj b/externals/grill/vasp/vasp.vcproj
index e5182f86..e47aea6e 100644
--- a/externals/grill/vasp/vasp.vcproj
+++ b/externals/grill/vasp/vasp.vcproj
@@ -98,11 +98,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pthreadVC.lib pd.lib"
+ AdditionalDependencies="pthreadVC2.lib pd.lib"
OutputFile=".\pd-msvc\td/vasp.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="c:\programme\audio\pd\bin"
+ AdditionalLibraryDirectories="c:\data\pd\pd-cvs\bin;c:\data\prog\packs\pthreads\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\pd-msvc\td/vasp.pdb"
ImportLibrary=".\pd-msvc\td/vasp.lib"