stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Account for Matlab 2016a in installer and mex-folder" 

This reverts commit 6072aa0b46.
time-shift
Stéphane Adjemian (Charybdis) 2016-05-03 22:20:10 +02:00
parent 6072aa0b46
commit 6593c433f3
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/ax_matlab_version.m4
View File

@ -22,9 +22,6 @@ 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"
;; ;;

2
matlab/add_path_to_mex_files.m
View File

@ -48,7 +48,7 @@ else
end end
end end
else else
tmp = [dynareroot '../mex/matlab/win64-7.8-9.0/']; tmp = [dynareroot '../mex/matlab/win64-7.8-8.6/'];
if exist(tmp, 'dir') if exist(tmp, 'dir')
mexpath = tmp; mexpath = tmp;
if modifypath if modifypath

6
windows/dynare.nsi
View File

@ -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.0 (R2009a to R2016a)" Section "MEX files for MATLAB 64-bit, version 7.8 to 8.6 (R2009a to R2015b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.0 SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.6
File ..\mex\matlab\win64-7.8-9.0\*.mexw64 File ..\mex\matlab\win64-7.8-8.6\*.mexw64
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd