Updated build for matlab R2020a.

(cherry picked from commit 16686514)
parent 664aa0d5
Pipeline #3404 passed with stages
in 303 minutes and 48 seconds
......@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version])
if test -n "$MATLAB_VERSION"; then
case $MATLAB_VERSION in
*2020a | *2020A)
MATLAB_VERSION="9.8"
;;
*2019b | *2019B)
MATLAB_VERSION="9.7"
;;
......
......@@ -89,7 +89,7 @@ NAME=dynare-"$VERSION"
PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
mkdir -p \
"$PKGFILES"/mex/matlab/maci64-7.9-9.3 \
"$PKGFILES"/mex/matlab/maci64-9.4-9.7 \
"$PKGFILES"/mex/matlab/maci64-9.4-9.8 \
"$PKGFILES"/mex/octave \
"$PKGFILES"/doc/dynare++ \
"$PKGFILES"/dynare++ \
......@@ -146,7 +146,7 @@ CC=$CC CXX=$CXX ./configure \
--with-slicot="$LIB64"/Slicot/with-underscore \
--with-matlab=/Applications/MATLAB_R2019b.app MATLAB_VERSION=R2019b
make -j"$NTHREADS"
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.7
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.8
##
......
......@@ -73,7 +73,7 @@ else
end
end
else
tmp = [dynareroot '../mex/matlab/win64-9.4-9.7/'];
tmp = [dynareroot '../mex/matlab/win64-9.4-9.8/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
......@@ -93,7 +93,7 @@ else
end
end
else
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.7'];
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.8'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
......
......@@ -167,8 +167,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.7
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.7
mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.8
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.8
}
# Create Windows DLL binaries for Octave/MinGW (32bit)
......
......@@ -96,9 +96,9 @@ Section "MEX files for MATLAB 64-bit, version 7.9 to 9.3 (R2009b to R2017b)"
File ..\mex\matlab\win64-7.9-9.3\*.mexw64
SectionEnd
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.7 (R2018a to R2019b)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.7
File ..\mex\matlab\win64-9.4-9.7\*.mexw64
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.8 (R2018a to R2020a)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.8
File ..\mex\matlab\win64-9.4-9.8\*.mexw64
SectionEnd
Section "MEX files for Octave 5.2.0 (64-bit)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment