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

Provisions for MATLAB 8.3 (R2014a).

time-shift
Sébastien Villemot 2014-03-18 14:59:08 +01:00
parent 632fd01836
commit a459a3440b
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
m4/ax_matlab_version.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2009-2013 Dynare Team
dnl Copyright (C) 2009-2014 Dynare Team
dnl
dnl This file is part of Dynare.
dnl
@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version])
if test "x$MATLAB_VERSION" != "x"; then
case $MATLAB_VERSION in
*2014a | *2014A)
MATLAB_VERSION="8.3"
;;
*2013b | *2013B)
MATLAB_VERSION="8.2"
;;

4
matlab/dynare_config.m
View File

@ -108,7 +108,7 @@ if isoctave
else
% Add win32 specific paths for Dynare Windows package
if strcmp(computer, 'PCWIN')
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.2'];
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.3'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
@ -122,7 +122,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.2'];
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.3'];
if exist(mexpath, 'dir')
addpath(mexpath)
end

12
windows/dynare.nsi
View File

@ -83,9 +83,9 @@ SectionEnd
SectionGroup "MEX files for MATLAB"
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.2 (R2007b to R2013b)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.2
File ..\mex\matlab\win32-7.5-8.2\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.3 (R2007b to R2014a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.3
File ..\mex\matlab\win32-7.5-8.3\*.mexw32
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
@ -93,9 +93,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
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.2 (R2009a to R2013b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.2
File ..\mex\matlab\win64-7.8-8.2\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.3 (R2009a to R2014a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.3
File ..\mex\matlab\win64-7.8-8.3\*.mexw64
SectionEnd
SectionGroupEnd