Commit c65ff9d9 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Fix crash with MATLAB 7.1 and 7.2 under Windows

Closes: #277
parent be932741
......@@ -100,13 +100,13 @@ if exist('OCTAVE_VERSION')
else
% Add win32 specific paths for Dynare Windows package
if strcmp(computer, 'PCWIN')
if matlab_ver_less_than('7.1')
mexpath = [dynareroot '../mex/matlab/win32-7.0-7.0.4'];
if matlab_ver_less_than('7.3')
mexpath = [dynareroot '../mex/matlab/win32-7.0-7.2'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
elseif matlab_ver_less_than('7.5')
mexpath = [dynareroot '../mex/matlab/win32-7.1-7.4'];
mexpath = [dynareroot '../mex/matlab/win32-7.3-7.4'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......
......@@ -83,14 +83,14 @@ SectionEnd
SectionGroup "MEX files for MATLAB"
Section "MEX files for MATLAB 32-bit, version 7.0 to 7.0.4 (R14 to R14SP2)"
SetOutPath $INSTDIR\mex\matlab\win32-7.0-7.0.4
File ..\mex\matlab\win32-7.0-7.0.4\*.dll
Section "MEX files for MATLAB 32-bit, version 7.0 to 7.2 (R14 to R2006a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.0-7.2
File ..\mex\matlab\win32-7.0-7.2\*.dll
SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.1 to 7.4 (R14SP3 to R2007a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.1-7.4
File ..\mex\matlab\win32-7.1-7.4\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.3-7.4
File ..\mex\matlab\win32-7.3-7.4\*.mexw32
SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.14 (R2007b to R2012a)"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment