Provisions for MATLAB 8.0 (R2012b)
parent
d87eb2813d
commit
c74b1d1bdc
|
@ -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
|
||||||
|
*2012b | *2012B)
|
||||||
|
MATLAB_VERSION="8.0"
|
||||||
|
;;
|
||||||
*2012a | *2012A)
|
*2012a | *2012A)
|
||||||
MATLAB_VERSION="7.14"
|
MATLAB_VERSION="7.14"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -111,7 +111,7 @@ else
|
||||||
addpath(mexpath)
|
addpath(mexpath)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
mexpath = [dynareroot '../mex/matlab/win32-7.5-7.14'];
|
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.0'];
|
||||||
if exist(mexpath, 'dir')
|
if exist(mexpath, 'dir')
|
||||||
addpath(mexpath)
|
addpath(mexpath)
|
||||||
end
|
end
|
||||||
|
@ -136,7 +136,7 @@ else
|
||||||
addpath(mexpath)
|
addpath(mexpath)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
mexpath = [dynareroot '../mex/matlab/win64-7.8-7.14'];
|
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.0'];
|
||||||
if exist(mexpath, 'dir')
|
if exist(mexpath, 'dir')
|
||||||
addpath(mexpath)
|
addpath(mexpath)
|
||||||
end
|
end
|
||||||
|
@ -150,7 +150,7 @@ else
|
||||||
addpath(mexpath)
|
addpath(mexpath)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
mexpath = [dynareroot '../mex/matlab/osx32-7.5-7.14'];
|
mexpath = [dynareroot '../mex/matlab/osx32-7.5-8.0'];
|
||||||
if exist(mexpath, 'dir')
|
if exist(mexpath, 'dir')
|
||||||
addpath(mexpath)
|
addpath(mexpath)
|
||||||
end
|
end
|
||||||
|
|
|
@ -93,9 +93,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 7.14 (R2007b to R2012a)"
|
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.0 (R2007b to R2012b)"
|
||||||
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.14
|
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.0
|
||||||
File ..\mex\matlab\win32-7.5-7.14\*.mexw32
|
File ..\mex\matlab\win32-7.5-8.0\*.mexw32
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "MEX files for MATLAB 64-bit, version 7.2 (R2006a)"
|
Section "MEX files for MATLAB 64-bit, version 7.2 (R2006a)"
|
||||||
|
@ -113,9 +113,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 7.14 (R2009a to R2012a)"
|
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.0 (R2009a to R2012b)"
|
||||||
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.14
|
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.0
|
||||||
File ..\mex\matlab\win64-7.8-7.14\*.mexw64
|
File ..\mex\matlab\win64-7.8-8.0\*.mexw64
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
SectionGroupEnd
|
SectionGroupEnd
|
||||||
|
|
Loading…
Reference in New Issue