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

Provisions for MATLAB R2010b (7.11)

parent a5b5f399
......@@ -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
*2010b | *2010B)
MATLAB_VERSION="7.11"
;;
*2010a | *2010A)
MATLAB_VERSION="7.10"
;;
......
......@@ -94,7 +94,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.10'];
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.11'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......@@ -119,7 +119,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.10'];
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.11'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......
......@@ -80,9 +80,9 @@ Section "MEX files for MATLAB 32-bit, version 6.5 to 7.4 (R13 to R2007a)"
File ..\mex\matlab\win32-6.5-7.4\*.dll
SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.10 (R2007b to R2010a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.10
File ..\mex\matlab\win32-7.5-7.10\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.11 (R2007b to R2010b)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.11
File ..\mex\matlab\win32-7.5-7.11\*.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.10 (R2009a to R2010a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.10
File ..\mex\matlab\win64-7.8-7.10\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to 7.11 (R2009a to R2010b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.11
File ..\mex\matlab\win64-7.8-7.11\*.mexw64
SectionEnd
SectionGroupEnd
......
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