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 f097e4754bd43b88c28e7356e3c69209277db060..b2f3175f099c6c54a9b91639a6b3a387bee16efe 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -122,7 +122,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 @@ -147,7 +147,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 @@ -161,7 +161,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 8d1f3ed71df5080fb206e29ce9cbaaf776a48e95..9ffcdd49296b7cd65caaff993e33075dcb80222f 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -85,8 +85,8 @@ Section "MEX files for MATLAB 32-bit, version 7.1 to 7.4 (R14SP3 to R2007a)" File ..\mex\matlab\win32-7.1-7.4\*.mexw32 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 @@ -106,8 +106,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