diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4 index 78a92687260eabbc08fd54b1853bf0565f42359e..fbd5e0da986eb88faf7425de198fdeafcf68afa8 100644 --- a/m4/ax_matlab_version.m4 +++ b/m4/ax_matlab_version.m4 @@ -1,4 +1,4 @@ -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" ;; diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index 0d939bab3f1bf059e069cd138b3211260673438f..a32a280f299526680116b06a3319f8f11d70b1ab 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -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 diff --git a/windows/dynare.nsi b/windows/dynare.nsi index 5e7e97147aadbf60e3b6c532b1d1bb0fc37fdba7..cf450fd7298ed026b0e43b27981b57f64ece9676 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -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