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
c65ff9d9
Commit
c65ff9d9
authored
12 years ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
Fix crash with MATLAB 7.1 and 7.2 under Windows
Closes:
#277
parent
be932741
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
matlab/dynare_config.m
+3
-3
3 additions, 3 deletions
matlab/dynare_config.m
windows/dynare.nsi
+6
-6
6 additions, 6 deletions
windows/dynare.nsi
with
9 additions
and
9 deletions
matlab/dynare_config.m
+
3
−
3
View file @
c65ff9d9
...
...
@@ -100,13 +100,13 @@ if exist('OCTAVE_VERSION')
else
% Add win32 specific paths for Dynare Windows package
if
strcmp
(
computer
,
'PCWIN'
)
if
matlab_ver_less_than
(
'7.
1
'
)
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.0-7.
0.4
'
];
if
matlab_ver_less_than
(
'7.
3
'
)
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.0-7.
2
'
];
if
exist
(
mexpath
,
'dir'
)
addpath
(
mexpath
)
end
elseif
matlab_ver_less_than
(
'7.5'
)
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.
1
-7.4'
];
mexpath
=
[
dynareroot
'../mex/matlab/win32-7.
3
-7.4'
];
if
exist
(
mexpath
,
'dir'
)
addpath
(
mexpath
)
end
...
...
This diff is collapsed.
Click to expand it.
windows/dynare.nsi
+
6
−
6
View file @
c65ff9d9
...
...
@@ -83,14 +83,14 @@ SectionEnd
SectionGroup "MEX files for MATLAB"
Section "MEX files for MATLAB 32-bit, version 7.0 to 7.
0.4
(R14 to R
14SP2
)"
SetOutPath $INSTDIR\mex\matlab\win32-7.0-7.
0.4
File ..\mex\matlab\win32-7.0-7.
0.4
\*.dll
Section "MEX files for MATLAB 32-bit, version 7.0 to 7.
2
(R14 to R
2006a
)"
SetOutPath $INSTDIR\mex\matlab\win32-7.0-7.
2
File ..\mex\matlab\win32-7.0-7.
2
\*.dll
SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.
1
to 7.4 (R
14SP3
to R2007a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.
1
-7.4
File ..\mex\matlab\win32-7.
1
-7.4\*.mexw32
Section "MEX files for MATLAB 32-bit, version 7.
3
to 7.4 (R
2006b
to R2007a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.
3
-7.4
File ..\mex\matlab\win32-7.
3
-7.4\*.mexw32
SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.14 (R2007b to R2012a)"
...
...
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