Account for Matlab 2016a in installer and mex-folder
Note that 32bit is not supported anymore (cherry picked from commit e37b32b01534ffe9a5a5ec3f00f745720b75a83f)time-shift
parent
6593c433f3
commit
b364dd1d4c
|
@ -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
|
||||||
|
*2016a | *2016A)
|
||||||
|
MATLAB_VERSION="9.0"
|
||||||
|
;;
|
||||||
*2015b | *2015B)
|
*2015b | *2015B)
|
||||||
MATLAB_VERSION="8.6"
|
MATLAB_VERSION="8.6"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -48,7 +48,7 @@ else
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
tmp = [dynareroot '../mex/matlab/win64-7.8-8.6/'];
|
tmp = [dynareroot '../mex/matlab/win64-7.8-9.0/'];
|
||||||
if exist(tmp, 'dir')
|
if exist(tmp, 'dir')
|
||||||
mexpath = tmp;
|
mexpath = tmp;
|
||||||
if modifypath
|
if modifypath
|
||||||
|
|
|
@ -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 8.6 (R2009a to R2015b)"
|
Section "MEX files for MATLAB 64-bit, version 7.8 to 9.0 (R2009a to R2016a)"
|
||||||
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.6
|
SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.0
|
||||||
File ..\mex\matlab\win64-7.8-8.6\*.mexw64
|
File ..\mex\matlab\win64-7.8-9.0\*.mexw64
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
SectionGroupEnd
|
SectionGroupEnd
|
||||||
|
|
Loading…
Reference in New Issue