Skip to content
Snippets Groups Projects
Commit a0fdc09c authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Provisions for MATLAB 9.4 (R2018a)

Take into account the API break in the MEX interface (new interleaved complex API).
But do not split MEX directories on MacOS X for the time being.

(cherry picked from commit 473b2f59)
parent 47745cbe
Branches
Tags
No related merge requests found
......@@ -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"
;;
......
......@@ -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
......
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment