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
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
a459a344
Commit
a459a344
authored
11 years ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
Provisions for MATLAB 8.3 (R2014a).
parent
632fd018
No related branches found
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
m4/ax_matlab_version.m4
+4
-1
4 additions, 1 deletion
m4/ax_matlab_version.m4
matlab/dynare_config.m
+2
-2
2 additions, 2 deletions
matlab/dynare_config.m
windows/dynare.nsi
+6
-6
6 additions, 6 deletions
windows/dynare.nsi
with
12 additions
and
9 deletions
m4/ax_matlab_version.m4
+
4
−
1
View file @
a459a344
dnl Copyright (C) 2009-201
3
Dynare Team
dnl Copyright (C) 2009-201
4
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
*2014a | *2014A)
MATLAB_VERSION="8.3"
;;
*2013b | *2013B)
*2013b | *2013B)
MATLAB_VERSION="8.2"
MATLAB_VERSION="8.2"
;;
;;
...
...
This diff is collapsed.
Click to expand it.
matlab/dynare_config.m
+
2
−
2
View file @
a459a344
...
@@ -108,7 +108,7 @@ if isoctave
...
@@ -108,7 +108,7 @@ if isoctave
else
else
% Add win32 specific paths for Dynare Windows package
% Add win32 specific paths for Dynare Windows package
if
strcmp
(
computer
,
'PCWIN'
)
if
strcmp
(
computer
,
'PCWIN'
)
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.5-8.
2
'
];
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.5-8.
3
'
];
if
exist
(
mexpath
,
'dir'
)
if
exist
(
mexpath
,
'dir'
)
addpath
(
mexpath
)
addpath
(
mexpath
)
end
end
...
@@ -122,7 +122,7 @@ else
...
@@ -122,7 +122,7 @@ else
addpath
(
mexpath
)
addpath
(
mexpath
)
end
end
else
else
mexpath
=
[
dynareroot
'../mex/matlab/win64-7.8-8.
2
'
];
mexpath
=
[
dynareroot
'../mex/matlab/win64-7.8-8.
3
'
];
if
exist
(
mexpath
,
'dir'
)
if
exist
(
mexpath
,
'dir'
)
addpath
(
mexpath
)
addpath
(
mexpath
)
end
end
...
...
This diff is collapsed.
Click to expand it.
windows/dynare.nsi
+
6
−
6
View file @
a459a344
...
@@ -83,9 +83,9 @@ SectionEnd
...
@@ -83,9 +83,9 @@ SectionEnd
SectionGroup "MEX files for MATLAB"
SectionGroup "MEX files for MATLAB"
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.
2
(R2007b to R201
3b
)"
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.
3
(R2007b to R201
4a
)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.
2
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.
3
File ..\mex\matlab\win32-7.5-8.
2
\*.mexw32
File ..\mex\matlab\win32-7.5-8.
3
\*.mexw32
SectionEnd
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
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)"
...
@@ -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
File ..\mex\matlab\win64-7.5-7.7\*.mexw64
SectionEnd
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.
2
(R2009a to R201
3b
)"
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.
3
(R2009a to R201
4a
)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.
2
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.
3
File ..\mex\matlab\win64-7.8-8.
2
\*.mexw64
File ..\mex\matlab\win64-7.8-8.
3
\*.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