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

Provisions for MATLAB 8.4 (R2014b)

time-shift
Houtan Bastani 2014-10-10 10:41:04 +02:00
parent eecf154cc1
commit f4f7a02fd7
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/ax_matlab_version.m4
View File

@ -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
*2014b | *2014B)
MATLAB_VERSION="8.4"
;;
*2014a | *2014A)
MATLAB_VERSION="8.3"
;;

4
matlab/dynare_config.m
View File

@ -110,7 +110,7 @@ if isoctave
else
% Add win32 specific paths for Dynare Windows package
if strcmp(computer, 'PCWIN')
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.3'];
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.4'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
@ -124,7 +124,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.3'];
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.4'];
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.3 (R2007b to R2014a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.3
File ..\mex\matlab\win32-7.5-8.3\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.4 (R2007b to R2014b)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.4
File ..\mex\matlab\win32-7.5-8.4\*.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.3 (R2009a to R2014a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.3
File ..\mex\matlab\win64-7.8-8.3\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.4 (R2009a to R2014b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.4
File ..\mex\matlab\win64-7.8-8.4\*.mexw64
SectionEnd
SectionGroupEnd