diff --git a/.gitignore b/.gitignore index 5c59f40..dd30e97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *DS_Store *.m~ +*.asv *octave-workspace # exclude content of logfiles folders diff --git a/initEnv.m b/initEnv.m index e135df6..c59cc15 100644 --- a/initEnv.m +++ b/initEnv.m @@ -15,7 +15,7 @@ function initEnv octaveVersion = '4.0.3'; - matlabVersion = '9.2.0'; + matlabVersion = '9.1.0'; if isOctave @@ -77,7 +77,7 @@ persistent cacheval % speeds up repeated calls if isempty (cacheval) - cacheval = (exist ("OCTAVE_VERSION", "builtin") > 0); + cacheval = (exist ('OCTAVE_VERSION', 'builtin') > 0); end retval = cacheval; @@ -86,7 +86,7 @@ function addDependencies() pth = fileparts(mfilename('fullpath')); - addpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src')); + addpath(genpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src'))); addpath(fullfile(pth, 'lib', 'CPP_PTB')); addpath(genpath(fullfile(pth, 'lib', 'CPP_PTB', 'src'))); addpath(fullfile(pth, 'subfun')); diff --git a/lib/CPP_PTB b/lib/CPP_PTB index 56b44dd..8c25300 160000 --- a/lib/CPP_PTB +++ b/lib/CPP_PTB @@ -1 +1 @@ -Subproject commit 56b44dde23db03cd9d77165231bbf74e9388930e +Subproject commit 8c253007d4ce30c9c1a5f97dbbe9b0a93c59d0ca