From 9a21667e69fbb305a8f4a6348e6a7b89e2d5808f Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 10 Dec 2013 18:17:31 +0100 Subject: [PATCH] For Matlab >= 2013a on osx, use renamed SDKROOT macro, MW_SDKROOT --- preprocessor/ModFile.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/preprocessor/ModFile.cc b/preprocessor/ModFile.cc index 56257c191..94f5a1a59 100644 --- a/preprocessor/ModFile.cc +++ b/preprocessor/ModFile.cc @@ -685,10 +685,17 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool no_log, b << " eval('mex -O LDFLAGS=''-pthread -shared -Wl,--no-undefined'' " << basename << "_static.c "<< basename << "_static_mex.c')" << endl; # else // MacOS // MATLAB/MacOS - mOutputFile << " eval('mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined error -arch \\$ARCHS -Wl,-syslibroot,\\$SDKROOT -mmacosx-version-min=\\$MACOSX_DEPLOYMENT_TARGET -bundle'' " + mOutputFile << " if matlab_ver_less_than('8.1')" << endl; + mOutputFile << " eval('mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined error -arch \\$ARCHS -Wl,-syslibroot,\\$SDKROOT -mmacosx-version-min=\\$MACOSX_DEPLOYMENT_TARGET -bundle'' " << basename << "_dynamic.c " << basename << "_dynamic_mex.c')" << endl - << " eval('mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined error -arch \\$ARCHS -Wl,-syslibroot,\\$SDKROOT -mmacosx-version-min=\\$MACOSX_DEPLOYMENT_TARGET -bundle'' " + << " eval('mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined error -arch \\$ARCHS -Wl,-syslibroot,\\$SDKROOT -mmacosx-version-min=\\$MACOSX_DEPLOYMENT_TARGET -bundle'' " << basename << "_static.c " << basename << "_static_mex.c')" << endl; + mOutputFile << " else" << endl; + mOutputFile << " eval('mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined error -arch \\$ARCHS -Wl,-syslibroot,\\$MW_SDKROOT -mmacosx-version-min=\\$MACOSX_DEPLOYMENT_TARGET -bundle'' " + << basename << "_dynamic.c " << basename << "_dynamic_mex.c')" << endl + << " eval('mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined error -arch \\$ARCHS -Wl,-syslibroot,\\$MW_SDKROOT -mmacosx-version-min=\\$MACOSX_DEPLOYMENT_TARGET -bundle'' " + << basename << "_static.c " << basename << "_static_mex.c')" << endl; + mOutputFile << " end" << endl; # endif #endif mOutputFile << "else" << endl // Octave