diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4 index 7e322d6e0d20e1ddca03e6645c695e5b54c3bc58..9a417c39b8580266e82716d74606c85a45b3f4b8 100644 --- a/m4/ax_matlab_version.m4 +++ b/m4/ax_matlab_version.m4 @@ -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" ;; diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index 1ebb55f6e9956bc1f0b8075a14a2b509397f3506..77b9dc56f68d97ea175cc2ab897ea382b39bb372 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -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 diff --git a/windows/dynare.nsi b/windows/dynare.nsi index 0a9b4d513d7ee3795fb14da4dc03b50373cb7780..eae63eb0fbe54a4838f3bc29271d5b6f26cba437 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -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