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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Minje Jeon
dynare
Commits
e37b32b0
Commit
e37b32b0
authored
9 years ago
by
Johannes Pfeifer
Browse files
Options
Downloads
Patches
Plain Diff
Account for Matlab 2016a in installer and mex-folder
Note that 32bit is not supported anymore
parent
a55f0007
Branches
Branches containing commit
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
+3
-0
3 additions, 0 deletions
m4/ax_matlab_version.m4
matlab/add_path_to_mex_files.m
+1
-1
1 addition, 1 deletion
matlab/add_path_to_mex_files.m
windows/dynare.nsi
+3
-3
3 additions, 3 deletions
windows/dynare.nsi
with
7 additions
and
4 deletions
m4/ax_matlab_version.m4
+
3
−
0
View file @
e37b32b0
...
...
@@ -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
*2016a | *2016A)
MATLAB_VERSION="9.0"
;;
*2015b | *2015B)
MATLAB_VERSION="8.6"
;;
...
...
This diff is collapsed.
Click to expand it.
matlab/add_path_to_mex_files.m
+
1
−
1
View file @
e37b32b0
...
...
@@ -48,7 +48,7 @@ else
end
end
else
tmp
=
[
dynareroot
'../mex/matlab/win64-7.8-
8.6
/'
];
tmp
=
[
dynareroot
'../mex/matlab/win64-7.8-
9.0
/'
];
if
exist
(
tmp
,
'dir'
)
mexpath
=
tmp
;
if
modifypath
...
...
This diff is collapsed.
Click to expand it.
windows/dynare.nsi
+
3
−
3
View file @
e37b32b0
...
...
@@ -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
8.6
(R2009a to R201
5b
)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-
8.6
File ..\mex\matlab\win64-7.8-
8.6
\*.mexw64
Section "MEX files for MATLAB 64-bit, version 7.8 to
9.0
(R2009a to R201
6a
)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-
9.0
File ..\mex\matlab\win64-7.8-
9.0
\*.mexw64
SectionEnd
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