Always use "isoctave" for testing Octave context

time-shift
Sébastien Villemot 2018-09-06 17:12:15 +02:00
parent 2a60e57dfc
commit 51416bf2ae
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@ if nargin<2
modifypath = true; modifypath = true;
end end
if exist('OCTAVE_VERSION') if isoctave
if ispc() && strcmpi(computer(), 'i686-w64-mingw32') if ispc() && strcmpi(computer(), 'i686-w64-mingw32')
mexpath = {[dynareroot '../mex/octave32/']}; mexpath = {[dynareroot '../mex/octave32/']};
else else

View File

@ -44,7 +44,7 @@ if ~isempty(Dmex)
end end
end end
if ~exist('OCTAVE_VERSION') if ~isoctave
% Some mex commands are enclosed in an eval(), because otherwise it will make Octave fail % Some mex commands are enclosed in an eval(), because otherwise it will make Octave fail
if ispc if ispc
if strcmp(win_compiler,'msvc') if strcmp(win_compiler,'msvc')