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

Provisions for MATLAB 8.1 (R2013a)

(cherry picked from commit 3bbdbf83)
parent ef9bbca7
Branches
Tags
No related merge requests found
dnl Copyright (C) 2009-2012 Dynare Team
dnl Copyright (C) 2009-2013 Dynare Team
dnl
dnl This file is part of Dynare.
dnl
......@@ -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
*2013a | *2013A)
MATLAB_VERSION="8.1"
;;
*2012b | *2012B)
MATLAB_VERSION="8.0"
;;
......
......@@ -15,7 +15,7 @@ function dynareroot = dynare_config(path_to_dynare,verbose)
% SPECIAL REQUIREMENTS
% none
% Copyright (C) 2001-2012 Dynare Team
% Copyright (C) 2001-2013 Dynare Team
%
% This file is part of Dynare.
%
......@@ -110,7 +110,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.0'];
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.1'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......@@ -135,7 +135,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.0'];
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.1'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......@@ -149,7 +149,7 @@ else
addpath(mexpath)
end
else
mexpath = [dynareroot '../mex/matlab/osx32-7.5-8.0'];
mexpath = [dynareroot '../mex/matlab/osx32-7.5-8.1'];
if exist(mexpath, 'dir')
addpath(mexpath)
end
......
......@@ -29,7 +29,7 @@ mkdir -p "$INSTALLDIR/contrib/ms-sbvar/TZcode"
mkdir -p "$INSTALLDIR/mex/octave"
mkdir -p "$INSTALLDIR/mex/matlab/osx64"
mkdir "$INSTALLDIR/mex/matlab/osx32-7.4"
mkdir "$INSTALLDIR/mex/matlab/osx32-7.5-8.0"
mkdir "$INSTALLDIR/mex/matlab/osx32-7.5-8.1"
# top level
......@@ -122,17 +122,17 @@ cd $TOP_DYN_DIR/mex/build/matlab
make
# Matlab
cp $TOP_DYN_DIR/mex/build/matlab/block_kalman_filter/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/bytecode/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/dynare_simul_/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/gensylv/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/k_order_perturbation/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/kalman_steady_state/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/kronecker/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/local_state_space_iterations/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/mjdgges/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/ms_sbvar/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/sobol/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0
cp $TOP_DYN_DIR/mex/build/matlab/block_kalman_filter/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/bytecode/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/dynare_simul_/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/gensylv/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/k_order_perturbation/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/kalman_steady_state/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/kronecker/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/local_state_space_iterations/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/mjdgges/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/ms_sbvar/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/sobol/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
#####################################
......
......@@ -93,9 +93,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.0 (R2007b to R2012b)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.0
File ..\mex\matlab\win32-7.5-8.0\*.mexw32
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
SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.2 (R2006a)"
......@@ -113,9 +113,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.0 (R2009a to R2012b)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.0
File ..\mex\matlab\win64-7.8-8.0\*.mexw64
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
SectionEnd
SectionGroupEnd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment