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

fix mex compilation commands for Matlab R2016b on macOS. Closes #1288

time-shift
Houtan Bastani 2016-10-20 14:03:35 +02:00
parent 4a1ad80747
commit 847feb17fa
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
matlab/utilities/general/dyn_mex.m
View File

@ -67,7 +67,7 @@ if ~exist('OCTAVE_VERSION')
error(['When using the USE_DLL option, you must give either ' ... error(['When using the USE_DLL option, you must give either ' ...
'''cygwin'', ''mingw'' or ''msvc'' option to the ''dynare'' command']) '''cygwin'', ''mingw'' or ''msvc'' option to the ''dynare'' command'])
end end
elseif isunix elseif isunix && ~ismac
% MATLAB/Linux % MATLAB/Linux
if matlab_ver_less_than('8.3') if matlab_ver_less_than('8.3')
eval(['mex -O LDFLAGS=''-pthread -shared -Wl,--no-undefined'' ' ... eval(['mex -O LDFLAGS=''-pthread -shared -Wl,--no-undefined'' ' ...
@ -83,31 +83,30 @@ if ~exist('OCTAVE_VERSION')
end end
elseif ismac elseif ismac
% MATLAB/MacOS % MATLAB/MacOS
if matlab_ver_less_than('8.3') if matlab_ver_less_than('8.1')
if matlab_ver_less_than('8.1') eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ...
eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ... 'error -arch $ARCHS -Wl,-syslibroot,$SDKROOT ' ...
'error -arch $ARCHS -Wl,-syslibroot,$SDKROOT ' ... '-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ...
'-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ... basename '_dynamic.c ' basename '_dynamic_mex.c'])
basename '_dynamic.c ' basename '_dynamic_mex.c']) eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ...
eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ... 'error -arch $ARCHS -Wl,-syslibroot,$SDKROOT ' ...
'error -arch $ARCHS -Wl,-syslibroot,$SDKROOT ' ... '-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ...
'-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ... basename '_static.c ' basename '_static_mex.c'])
basename '_static.c ' basename '_static_mex.c']) elseif matlab_ver_less_than('8.3')
else eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ...
eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ... 'error -arch $ARCHS -Wl,-syslibroot,$MW_SDKROOT ' ...
'error -arch $ARCHS -Wl,-syslibroot,$MW_SDKROOT ' ... '-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ...
'-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ... basename '_dynamic.c ' basename '_dynamic_mex.c'])
basename '_dynamic.c ' basename '_dynamic_mex.c']) eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ...
eval(['mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined ' ... 'error -arch $ARCHS -Wl,-syslibroot,$MW_SDKROOT ' ...
'error -arch $ARCHS -Wl,-syslibroot,$MW_SDKROOT ' ... '-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ...
'-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -bundle'' ' ... basename '_static.c ' basename '_static_mex.c'])
basename '_static.c ' basename '_static_mex.c']) elseif matlab_ver_less_than('9.1')
end eval(['mex -O LINKEXPORT='''' ' basename '_dynamic.c ' basename '_dynamic_mex.c'])
eval(['mex -O LINKEXPORT='''' ' basename '_static.c ' basename '_static_mex.c'])
else else
eval(['mex -O LINKEXPORT='''' ' basename '_dynamic.c ' ... eval(['mex -O LINKEXPORT='''' LINKEXPORTVER='''' ' basename '_dynamic.c ' basename '_dynamic_mex.c'])
basename '_dynamic_mex.c']) eval(['mex -O LINKEXPORT='''' LINKEXPORTVER='''' ' basename '_static.c ' basename '_static_mex.c'])
eval(['mex -O LINKEXPORT='''' ' basename '_static.c ' basename ...
'_static_mex.c'])
end end
end end
else else