Provisions for MATLAB R2021a
parent
3f7111cf5d
commit
baa6c8dbbd
|
@ -1,4 +1,4 @@
|
||||||
dnl Copyright © 2009-2020 Dynare Team
|
dnl Copyright © 2009-2021 Dynare Team
|
||||||
dnl
|
dnl
|
||||||
dnl This file is part of Dynare.
|
dnl This file is part of Dynare.
|
||||||
dnl
|
dnl
|
||||||
|
@ -44,6 +44,9 @@ fi
|
||||||
if test -n "$MATLAB_VERSION"; then
|
if test -n "$MATLAB_VERSION"; then
|
||||||
dnl Convert a release number (Rnnnnx) into a version number (x.y)
|
dnl Convert a release number (Rnnnnx) into a version number (x.y)
|
||||||
case $MATLAB_VERSION in
|
case $MATLAB_VERSION in
|
||||||
|
*2021a | *2021A)
|
||||||
|
MATLAB_VERSION="9.10"
|
||||||
|
;;
|
||||||
*2020b | *2020B)
|
*2020b | *2020B)
|
||||||
MATLAB_VERSION="9.9"
|
MATLAB_VERSION="9.9"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -94,7 +94,7 @@ PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
"$PKGFILES"/preprocessor \
|
"$PKGFILES"/preprocessor \
|
||||||
"$PKGFILES"/mex/matlab/maci64-8.3-9.3 \
|
"$PKGFILES"/mex/matlab/maci64-8.3-9.3 \
|
||||||
"$PKGFILES"/mex/matlab/maci64-9.4-9.9 \
|
"$PKGFILES"/mex/matlab/maci64-9.4-9.10 \
|
||||||
"$PKGFILES"/doc/dynare++ \
|
"$PKGFILES"/doc/dynare++ \
|
||||||
"$PKGFILES"/dynare++ \
|
"$PKGFILES"/dynare++ \
|
||||||
"$PKGFILES"/scripts \
|
"$PKGFILES"/scripts \
|
||||||
|
@ -158,7 +158,7 @@ make clean
|
||||||
--with-slicot="$LIB64"/Slicot/with-underscore \
|
--with-slicot="$LIB64"/Slicot/with-underscore \
|
||||||
--with-matlab=/Applications/MATLAB_R2019b.app
|
--with-matlab=/Applications/MATLAB_R2019b.app
|
||||||
make -j"$NTHREADS"
|
make -j"$NTHREADS"
|
||||||
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.9
|
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.10
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
function mexpath = add_path_to_mex_files(dynareroot, modifypath)
|
function mexpath = add_path_to_mex_files(dynareroot, modifypath)
|
||||||
|
|
||||||
% Copyright (C) 2015-2020 Dynare Team
|
% Copyright (C) 2015-2021 Dynare Team
|
||||||
%
|
%
|
||||||
% This file is part of Dynare.
|
% This file is part of Dynare.
|
||||||
%
|
%
|
||||||
|
@ -60,7 +60,7 @@ else
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
tmp = [dynareroot '../mex/matlab/win64-9.4-9.9/'];
|
tmp = [dynareroot '../mex/matlab/win64-9.4-9.10/'];
|
||||||
if exist(tmp, 'dir')
|
if exist(tmp, 'dir')
|
||||||
mexpath = tmp;
|
mexpath = tmp;
|
||||||
if modifypath
|
if modifypath
|
||||||
|
@ -80,7 +80,7 @@ else
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.9'];
|
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.10'];
|
||||||
if exist(tmp, 'dir')
|
if exist(tmp, 'dir')
|
||||||
mexpath = tmp;
|
mexpath = tmp;
|
||||||
if modifypath
|
if modifypath
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# The binaries are cross compiled for Windows (64-bit), Octave and MATLAB
|
# The binaries are cross compiled for Windows (64-bit), Octave and MATLAB
|
||||||
# (all supported versions).
|
# (all supported versions).
|
||||||
|
|
||||||
# Copyright © 2017-2020 Dynare Team
|
# Copyright © 2017-2021 Dynare Team
|
||||||
#
|
#
|
||||||
# This file is part of Dynare.
|
# This file is part of Dynare.
|
||||||
#
|
#
|
||||||
|
@ -121,8 +121,8 @@ build_windows_matlab_mex_64_b ()
|
||||||
PACKAGE_STRING="dynare $VERSION"
|
PACKAGE_STRING="dynare $VERSION"
|
||||||
make -j"$NTHREADS" all
|
make -j"$NTHREADS" all
|
||||||
x86_64-w64-mingw32-strip -- **/*.mexw64
|
x86_64-w64-mingw32-strip -- **/*.mexw64
|
||||||
mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.9
|
mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.10
|
||||||
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.9
|
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.10
|
||||||
}
|
}
|
||||||
|
|
||||||
# Create Windows DLL binaries for Octave/MinGW (64bit)
|
# 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
|
File ..\mex\matlab\win64-8.3-9.3\*.mexw64
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.9 (R2018a to R2020b)"
|
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.10 (R2018a to R2021a)"
|
||||||
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.9
|
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.10
|
||||||
File ..\mex\matlab\win64-9.4-9.9\*.mexw64
|
File ..\mex\matlab\win64-9.4-9.10\*.mexw64
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "MinGW compiler for MATLAB 64-bit"
|
Section "MinGW compiler for MATLAB 64-bit"
|
||||||
|
|
Loading…
Reference in New Issue