stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated build for matlab R2020a. 

(cherry picked from commit 166865149e)
time-shift
Stéphane Adjemian (Charybdis) 2020-03-26 11:20:24 +01:00
parent e90549d2df
commit 23c927b708
Signed by: stepan
GPG Key ID: 295C1FE89E17EB3C
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/ax_matlab_version.m4
View File

@ -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"
;;

4
macOS/build.sh
View File

@ -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++ \
@ -145,7 +145,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
##

4
matlab/add_path_to_mex_files.m
View File

@ -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

4
windows/build.sh
View File

@ -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)

6
windows/dynare.nsi
View File

@ -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.1.0 (64-bit)"