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

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

This reverts commit 6072aa0b.
parent 6072aa0b
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
+ 0
− 3
View file @ 6593c433
...@@ -22,9 +22,6 @@ AC_REQUIRE([AX_MATLAB]) ...@@ -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"
;; ;;
......
matlab/add_path_to_mex_files.m
+ 1
− 1
View file @ 6593c433
...@@ -48,7 +48,7 @@ else ...@@ -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
......
windows/dynare.nsi
+ 3
− 3
View file @ 6593c433
...@@ -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.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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment