diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4 index 603b29945e7a36a79558c5e4ede444cf7464ad66..1004b91b9ec49f05ee5dcfe0501c3154bf4c2de0 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 + *2018a | *2018A) + MATLAB_VERSION="9.4" + ;; *2017b | *2017B) MATLAB_VERSION="9.3" ;; diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m index 0e5ddc5edf407d881448aaaec9f57c0ba2c712a3..e7f5967b3b5292ec847364a991975eefe8873809 100644 --- a/matlab/add_path_to_mex_files.m +++ b/matlab/add_path_to_mex_files.m @@ -51,7 +51,7 @@ else addpath(mexpath); end end - else + elseif matlab_ver_less_than('9.4') tmp = [dynareroot '../mex/matlab/win64-7.8-9.3/']; if exist(tmp, 'dir') mexpath = tmp; @@ -59,6 +59,14 @@ else addpath(mexpath); end end + else + tmp = [dynareroot '../mex/matlab/win64-9.4/']; + if exist(tmp, 'dir') + mexpath = tmp; + if modifypath + addpath(mexpath); + end + end end end % Add OS X 64bits specific paths for Dynare Mac package diff --git a/windows/dynare.nsi b/windows/dynare.nsi index cf4b39491fb7d3fcb934f458387234e9d58f54be..6d7ffbee2d78b19d4d849df7fcb2dff61a76db21 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -103,6 +103,11 @@ Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)" File ..\mex\matlab\win64-7.8-9.3\*.mexw64 SectionEnd +Section "MEX files for MATLAB 64-bit, version 9.4 (R2018a)" + SetOutPath $INSTDIR\mex\matlab\win64-9.4 + File ..\mex\matlab\win64-9.4\*.mexw64 +SectionEnd + SectionGroupEnd SectionGroup "MEX files for OCTAVE"