Provisions for MATLAB 7.13 (R2011b)

time-shift
Sébastien Villemot 2011-09-22 18:05:06 +02:00
parent 1018f24f19
commit 21ceaa5cb4
3 changed files with 11 additions and 8 deletions

View File

@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version])
if test "x$MATLAB_VERSION" != "x"; then
case $MATLAB_VERSION in
*2011b | *2011B)
MATLAB_VERSION="7.13"
;;
*2011a | *2011A)
MATLAB_VERSION="7.12"
;;

View File

@ -101,7 +101,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.12'];
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.13'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
@ -126,7 +126,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.12'];
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.13'];
if exist(mexpath, 'dir')
addpath(mexpath)
end

View File

@ -80,9 +80,9 @@ Section "MEX files for MATLAB 32-bit, version 7.0 to 7.4 (R14 to R2007a)"
File ..\mex\matlab\win32-7.0-7.4\*.dll
SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.12 (R2007b to R2011a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.12
File ..\mex\matlab\win32-7.5-7.12\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.13 (R2007b to R2011b)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.13
File ..\mex\matlab\win32-7.5-7.13\*.mexw32
SectionEnd
# Currently we don't have that version of MATLAB
@ -101,9 +101,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
File ..\mex\matlab\win64-7.5-7.7\*.mexw64
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.8 to 7.12 (R2009a to R2011a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.12
File ..\mex\matlab\win64-7.8-7.12\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to 7.13 (R2009a to R2011b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.13
File ..\mex\matlab\win64-7.8-7.13\*.mexw64
SectionEnd
SectionGroupEnd