Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stéphane Adjemian
dynare
Commits
c986be54
Verified
Commit
c986be54
authored
5 years ago
by
Houtan Bastani
Committed by
Sébastien Villemot
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
build support for Matlab R2019b
(cherry picked from commit
a1a4168c
)
parent
0108d603
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
m4/ax_matlab_version.m4
+4
-1
4 additions, 1 deletion
m4/ax_matlab_version.m4
windows/dynare.nsi
+3
-3
3 additions, 3 deletions
windows/dynare.nsi
with
7 additions
and
4 deletions
m4/ax_matlab_version.m4
+
4
−
1
View file @
c986be54
dnl Copyright (C) 2009-201
6
Dynare Team
dnl Copyright (C) 2009-201
9
Dynare Team
dnl
dnl
dnl This file is part of Dynare.
dnl This file is part of Dynare.
dnl
dnl
...
@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
...
@@ -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
*2019b | *2019B)
MATLAB_VERSION="9.7"
;;
*2019a | *2019A)
*2019a | *2019A)
MATLAB_VERSION="9.6"
MATLAB_VERSION="9.6"
;;
;;
...
...
This diff is collapsed.
Click to expand it.
windows/dynare.nsi
+
3
−
3
View file @
c986be54
...
@@ -103,9 +103,9 @@ Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)"
...
@@ -103,9 +103,9 @@ Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)"
File ..\mex\matlab\win64-7.8-9.3\*.mexw64
File ..\mex\matlab\win64-7.8-9.3\*.mexw64
SectionEnd
SectionEnd
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.
5
(R2018a to R2019
a
)"
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.
7
(R2018a to R2019
b
)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.
6
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.
7
File ..\mex\matlab\win64-9.4-9.
6
\*.mexw64
File ..\mex\matlab\win64-9.4-9.
7
\*.mexw64
SectionEnd
SectionEnd
SectionGroupEnd
SectionGroupEnd
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment