diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4 index 2fae21f2c5294eb7c9e01aadb66a4d7d30af79dd..282d2ad547ecca6443c3f24a28cf757377433ea5 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 + *2016b | *2016B) + MATLAB_VERSION="9.1" + ;; *2016a | *2016A) MATLAB_VERSION="9.0" ;; diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m index 25886c844338adb8f4ef5edab78ecf35296a2b47..38da0d345a95a6f2cad33604511009aeedf9fbe4 100644 --- a/matlab/add_path_to_mex_files.m +++ b/matlab/add_path_to_mex_files.m @@ -48,7 +48,7 @@ else end end else - tmp = [dynareroot '../mex/matlab/win64-7.8-9.0/']; + tmp = [dynareroot '../mex/matlab/win64-7.8-9.1/']; if exist(tmp, 'dir') mexpath = tmp; if modifypath diff --git a/windows/dynare.nsi b/windows/dynare.nsi index aaa1d5de5d01c42df9cb7f85e5b64ec928d55e7f..c72bc4c0fd6fa788ce7c25915b82421b1f927b99 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -98,9 +98,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 9.0 (R2009a to R2016a)" - SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.0 - File ..\mex\matlab\win64-7.8-9.0\*.mexw64 +Section "MEX files for MATLAB 64-bit, version 7.8 to 9.1 (R2009a to R2016b)" + SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.1 + File ..\mex\matlab\win64-7.8-9.1\*.mexw64 SectionEnd SectionGroupEnd