Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dóra Kocsis
dynare
Commits
c47b1775
Commit
c47b1775
authored
Sep 10, 2010
by
Sébastien Villemot
Browse files
Provisions for MATLAB R2010b (7.11)
parent
a5b5f399
Changes
3
Hide whitespace changes
Inline
Side-by-side
m4/ax_matlab_version.m4
View file @
c47b1775
...
...
@@ -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
*2010b | *2010B)
MATLAB_VERSION="7.11"
;;
*2010a | *2010A)
MATLAB_VERSION="7.10"
;;
...
...
matlab/dynare_config.m
View file @
c47b1775
...
...
@@ -94,7 +94,7 @@ else
addpath
(
mexpath
)
end
else
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.5-7.1
0
'
];
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.5-7.1
1
'
];
if
exist
(
mexpath
,
'dir'
)
addpath
(
mexpath
)
end
...
...
@@ -119,7 +119,7 @@ else
addpath
(
mexpath
)
end
else
mexpath
=
[
dynareroot
'../mex/matlab/win64-7.8-7.1
0
'
];
mexpath
=
[
dynareroot
'../mex/matlab/win64-7.8-7.1
1
'
];
if
exist
(
mexpath
,
'dir'
)
addpath
(
mexpath
)
end
...
...
windows/dynare.nsi
View file @
c47b1775
...
...
@@ -80,9 +80,9 @@ Section "MEX files for MATLAB 32-bit, version 6.5 to 7.4 (R13 to R2007a)"
File ..\mex\matlab\win32-6.5-7.4\*.dll
SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.1
0
(R2007b to R2010
a
)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.1
0
File ..\mex\matlab\win32-7.5-7.1
0
\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.1
1
(R2007b to R2010
b
)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.1
1
File ..\mex\matlab\win32-7.5-7.1
1
\*.mexw32
SectionEnd
# Currently we don't have that version of MATLAB
...
...
@@ -101,9 +101,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 7.1
0
(R2009a to R2010
a
)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.1
0
File ..\mex\matlab\win64-7.8-7.1
0
\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to 7.1
1
(R2009a to R2010
b
)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.1
1
File ..\mex\matlab\win64-7.8-7.1
1
\*.mexw64
SectionEnd
SectionGroupEnd
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment