From c65ff9d988a9c3fd4c34d9ff330f7c4551d7f61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Tue, 11 Sep 2012 12:32:11 +0200
Subject: [PATCH] Fix crash with MATLAB 7.1 and 7.2 under Windows
Closes: #277
---
matlab/dynare_config.m | 6 +++---
windows/dynare.nsi | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index c5963cc36..d9b6846f7 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -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
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index c281d82af..f2427a2fc 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -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 R14SP2)"
- 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 R2006a)"
+ 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 (R14SP3 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 (R2006b 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)"
--
GitLab