From b3d835bd48c3cb2917aa8c04e2dd39e8ed50fa40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 25 Sep 2013 15:59:50 +0200
Subject: [PATCH] Provisions for MATLAB 8.2 (R2013b)
---
m4/ax_matlab_version.m4 | 3 +++
matlab/dynare_config.m | 4 ++--
windows/dynare.nsi | 12 ++++++------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 12b5693dc..55eb57036 100644
--- a/m4/ax_matlab_version.m4
+++ b/m4/ax_matlab_version.m4
@@ -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
+ *2013b | *2013B)
+ MATLAB_VERSION="8.2"
+ ;;
*2013a | *2013A)
MATLAB_VERSION="8.1"
;;
diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index 2cd7b7487..3180a81a6 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -118,7 +118,7 @@ else
addpath(mexpath)
end
else
- mexpath = [dynareroot '../mex/matlab/win32-7.5-8.1'];
+ mexpath = [dynareroot '../mex/matlab/win32-7.5-8.2'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
@@ -138,7 +138,7 @@ else
addpath(mexpath)
end
else
- mexpath = [dynareroot '../mex/matlab/win64-7.8-8.1'];
+ mexpath = [dynareroot '../mex/matlab/win64-7.8-8.2'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index bd17b0bfe..e2fbc886d 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -88,9 +88,9 @@ Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)"
File ..\mex\matlab\win32-7.3-7.4\*.mexw32
SectionEnd
-Section "MEX files for MATLAB 32-bit, version 7.5 to 8.1 (R2007b to R2013a)"
- SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.1
- File ..\mex\matlab\win32-7.5-8.1\*.mexw32
+Section "MEX files for MATLAB 32-bit, version 7.5 to 8.2 (R2007b to R2013b)"
+ SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.2
+ File ..\mex\matlab\win32-7.5-8.2\*.mexw32
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.3 to 7.4 (R2006b to R2007a)"
@@ -103,9 +103,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.1 (R2009a to R2013a)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.1
- File ..\mex\matlab\win64-7.8-8.1\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 8.2 (R2009a to R2013b)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.2
+ File ..\mex\matlab\win64-7.8-8.2\*.mexw64
SectionEnd
SectionGroupEnd
--
GitLab