Skip to content
Snippets Groups Projects
Commit c74b1d1b authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Provisions for MATLAB 8.0 (R2012b)

parent d87eb281
No related branches found
No related tags found
No related merge requests found
......@@ -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
*2012b | *2012B)
MATLAB_VERSION="8.0"
;;
*2012a | *2012A)
MATLAB_VERSION="7.14"
;;
......
......@@ -111,7 +111,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.14'];
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.0'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......@@ -136,7 +136,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.14'];
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.0'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......@@ -150,7 +150,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/osx32-7.5-7.14'];
mexpath = [dynareroot '../mex/matlab/osx32-7.5-8.0'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......
......@@ -93,9 +93,9 @@ Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)"
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)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.14
File ..\mex\matlab\win32-7.5-7.14\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.0 (R2007b to R2012b)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.0
File ..\mex\matlab\win32-7.5-8.0\*.mexw32
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.2 (R2006a)"
......@@ -113,9 +113,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.14 (R2009a to R2012a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.14
File ..\mex\matlab\win64-7.8-7.14\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.0 (R2009a to R2012b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.0
File ..\mex\matlab\win64-7.8-8.0\*.mexw64
SectionEnd
SectionGroupEnd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment