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

Provisions for MATLAB 8.3 (R2014a).

(manually cherry picked from commit a459a344)
parent 406d6b19
No related branches found
No related tags found
No related merge requests found
dnl Copyright (C) 2009-2013 Dynare Team dnl Copyright (C) 2009-2014 Dynare Team
dnl dnl
dnl This file is part of Dynare. dnl This file is part of Dynare.
dnl dnl
...@@ -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
*2014a | *2014A)
MATLAB_VERSION="8.3"
;;
*2013b | *2013B) *2013b | *2013B)
MATLAB_VERSION="8.2" MATLAB_VERSION="8.2"
;; ;;
......
...@@ -119,7 +119,7 @@ else ...@@ -119,7 +119,7 @@ else
addpath(mexpath) addpath(mexpath)
end end
else else
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.2']; mexpath = [dynareroot '../mex/matlab/win32-7.5-8.3'];
if exist(mexpath, 'dir') if exist(mexpath, 'dir')
addpath(mexpath) addpath(mexpath)
end end
...@@ -139,7 +139,7 @@ else ...@@ -139,7 +139,7 @@ else
addpath(mexpath) addpath(mexpath)
end end
else else
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.2']; mexpath = [dynareroot '../mex/matlab/win64-7.8-8.3'];
if exist(mexpath, 'dir') if exist(mexpath, 'dir')
addpath(mexpath) addpath(mexpath)
end end
......
...@@ -88,9 +88,9 @@ Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)" ...@@ -88,9 +88,9 @@ Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)"
File ..\mex\matlab\win32-7.3-7.4\*.mexw32 File ..\mex\matlab\win32-7.3-7.4\*.mexw32
SectionEnd SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.2 (R2007b to R2013b)" Section "MEX files for MATLAB 32-bit, version 7.5 to 8.3 (R2007b to R2014a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.2 SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.3
File ..\mex\matlab\win32-7.5-8.2\*.mexw32 File ..\mex\matlab\win32-7.5-8.3\*.mexw32
SectionEnd SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.3 to 7.4 (R2006b to R2007a)" Section "MEX files for MATLAB 64-bit, version 7.3 to 7.4 (R2006b to R2007a)"
...@@ -103,9 +103,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)" ...@@ -103,9 +103,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.2 (R2009a to R2013b)" Section "MEX files for MATLAB 64-bit, version 7.8 to 8.3 (R2009a to R2014a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.2 SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.3
File ..\mex\matlab\win64-7.8-8.2\*.mexw64 File ..\mex\matlab\win64-7.8-8.3\*.mexw64
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment