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
Mark Song
dynare
Commits
bee53300
Commit
bee53300
authored
Oct 17, 2017
by
Stéphane Adjemian
Browse files
Account for matlab R2017b.
(cherry picked from commit
798c22fb
)
parent
20f5b0d9
Changes
3
Hide whitespace changes
Inline
Side-by-side
m4/ax_matlab_version.m4
View file @
bee53300
...
...
@@ -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
*2017b | *2017B)
MATLAB_VERSION="9.3"
;;
*2017a | *2017A)
MATLAB_VERSION="9.2"
;;
...
...
matlab/add_path_to_mex_files.m
View file @
bee53300
...
...
@@ -52,7 +52,7 @@ else
end
end
else
tmp
=
[
dynareroot
'../mex/matlab/win64-7.8-9.
2
/'
];
tmp
=
[
dynareroot
'../mex/matlab/win64-7.8-9.
3
/'
];
if
exist
(
tmp
,
'dir'
)
mexpath
=
tmp
;
if
modifypath
...
...
windows/dynare.nsi
View file @
bee53300
...
...
@@ -98,9 +98,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 9.
2
(R2009a to R2017
a
)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.
2
File ..\mex\matlab\win64-7.8-9.
2
\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to 9.
3
(R2009a to R2017
b
)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.
3
File ..\mex\matlab\win64-7.8-9.
3
\*.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