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

Provisions for MATLAB 7.14 (R2012a)

(cherry picked from commit ebfeae2c)
parent d9b6d5d9
No related branches found
Tags
No related merge requests found
dnl Copyright (C) 2009-2011 Dynare Team
dnl Copyright (C) 2009-2012 Dynare Team
dnl
dnl This file is part of Dynare.
dnl
......@@ -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
*2012a | *2012A)
MATLAB_VERSION="7.14"
;;
*2011b | *2011B)
MATLAB_VERSION="7.13"
;;
......
......@@ -87,7 +87,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.13'];
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.14'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......@@ -112,7 +112,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.13'];
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.14'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......@@ -126,7 +126,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/osx32-7.5-7.13'];
mexpath = [dynareroot '../mex/matlab/osx32-7.5-7.14'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......
......@@ -80,8 +80,8 @@ 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.13 (R2007b to R2011b)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.13
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.13\*.mexw32
SectionEnd
......@@ -101,8 +101,8 @@ 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.13 (R2009a to R2011b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.13
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.13\*.mexw64
SectionEnd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment