Skip to content
Snippets Groups Projects
Commit 4f3b35ac authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Account for Matlab 2017a. 

(cherry picked from commit f3a1619040fbb831830791424015d3d3bf8bdbae)
parent ea13b12c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
m4/ax_matlab_version.m4
+ 3
− 0
View file @ 4f3b35ac
...@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB]) ...@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version]) AC_MSG_CHECKING([for MATLAB version])
if test "x$MATLAB_VERSION" != "x"; then if test "x$MATLAB_VERSION" != "x"; then
case $MATLAB_VERSION in case $MATLAB_VERSION in
*2017a | *2017A)
MATLAB_VERSION="9.2"
;;
*2016b | *2016B) *2016b | *2016B)
MATLAB_VERSION="9.1" MATLAB_VERSION="9.1"
;; ;;
......
matlab/add_path_to_mex_files.m
+ 1
− 1
View file @ 4f3b35ac
...@@ -48,7 +48,7 @@ else ...@@ -48,7 +48,7 @@ else
end end
end end
else else
tmp = [dynareroot '../mex/matlab/win64-7.8-9.1/']; tmp = [dynareroot '../mex/matlab/win64-7.8-9.2/'];
if exist(tmp, 'dir') if exist(tmp, 'dir')
mexpath = tmp; mexpath = tmp;
if modifypath if modifypath
......
windows/dynare.nsi
+ 3
− 3
View file @ 4f3b35ac
...@@ -98,9 +98,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)" ...@@ -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 File ..\mex\matlab\win64-7.5-7.7\*.mexw64
SectionEnd SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.8 to 9.1 (R2009a to R2016b)" Section "MEX files for MATLAB 64-bit, version 7.8 to 9.2 (R2009a to R2017a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.1 SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.2
File ..\mex\matlab\win64-7.8-9.1\*.mexw64 File ..\mex\matlab\win64-7.8-9.2\*.mexw64
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment