Skip to content
Snippets Groups Projects
Verified Commit 36a7b019 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Provisions for MATLAB R2022b

parent 3d96e390
Branches
Tags
No related merge requests found
......@@ -14,7 +14,7 @@ compilation steps are necessary in that case.
In order to run Dynare, you need one of the following:
* MATLAB, any version ranging from 8.3 (R2014a) to 9.12 (R2022a);
* MATLAB, any version ranging from 8.3 (R2014a) to 9.13 (R2022b);
* GNU Octave, any version ranging from 6.2.0 to 7.2.0, with the statistics package
from `Octave-Forge`_. Note however that the Dynare installer for Windows
requires a more specific version of Octave, as indicated on the download
......
......@@ -44,6 +44,9 @@ fi
if test -n "$MATLAB_VERSION"; then
dnl Convert a release number (Rnnnnx) into a version number (x.y)
case $MATLAB_VERSION in
*2022b | *2022B)
MATLAB_VERSION="9.13"
;;
*2022a | *2022A)
MATLAB_VERSION="9.12"
;;
......
......@@ -112,7 +112,7 @@ PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
mkdir -p \
"$PKGFILES"/preprocessor \
"$PKGFILES"/mex/matlab/maci64-8.3-9.3 \
"$PKGFILES"/mex/matlab/maci64-9.4-9.12 \
"$PKGFILES"/mex/matlab/maci64-9.4-9.13 \
"$PKGFILES"/doc/dynare++ \
"$PKGFILES"/dynare++ \
"$PKGFILES"/scripts \
......@@ -176,7 +176,7 @@ make clean
--with-slicot="$LIB64"/Slicot/with-underscore \
--with-matlab=/Applications/MATLAB_R2019b.app
make -j"$NTHREADS"
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.12
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.13
##
......
......@@ -60,7 +60,7 @@ else
end
end
else
tmp = [dynareroot '../mex/matlab/win64-9.4-9.12/'];
tmp = [dynareroot '../mex/matlab/win64-9.4-9.13/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
......@@ -80,7 +80,7 @@ else
end
end
else
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.12'];
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.13'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
......
......@@ -21,8 +21,8 @@ Note: Dynare comes with an automated uninstaller, which you can run from the
Using Dynare with MATLAB®
─────────────────────────
Dynare works on top of MATLAB®, any version ranging from 8.3 (R2014a) to 9.12
(R2022a). Only 64-bit versions are supported.
Dynare works on top of MATLAB®, any version ranging from 8.3 (R2014a) to 9.13
(R2022b). Only 64-bit versions are supported.
To use Dynare, you just have to add the ‘matlab’ subdirectory of your Dynare
installation to MATLAB® path. You have two options for doing that:
......
......@@ -121,8 +121,8 @@ build_windows_matlab_mex_64_b ()
PACKAGE_STRING="dynare $VERSION"
make -j"$NTHREADS" all
x86_64-w64-mingw32-strip -- **/*.mexw64
mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.12
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.12
mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.13
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.13
}
# Create Windows DLL binaries for Octave/MinGW (64bit)
......
......@@ -90,9 +90,9 @@ Section "MEX files for MATLAB 64-bit, version 8.3 to 9.3 (R2014a to R2017b)"
File ..\mex\matlab\win64-8.3-9.3\*.mexw64
SectionEnd
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.12 (R2018a to R2022a)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.12
File ..\mex\matlab\win64-9.4-9.12\*.mexw64
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.13 (R2018a to R2022b)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.13
File ..\mex\matlab\win64-9.4-9.13\*.mexw64
SectionEnd
Section "MinGW compiler for MATLAB 64-bit"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment