changes related to #641 for os x
parent
39e9bfceeb
commit
2515d772ab
19
ModFile.cc
19
ModFile.cc
|
@ -696,17 +696,22 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool no_log, b
|
||||||
<< " end" << endl;
|
<< " end" << endl;
|
||||||
# else // MacOS
|
# else // MacOS
|
||||||
// MATLAB/MacOS
|
// MATLAB/MacOS
|
||||||
mOutputFile << " if matlab_ver_less_than('8.1')" << endl;
|
mOutputFile << " if matlab_ver_less_than('8.3')" << endl
|
||||||
mOutputFile << " eval('mex -O LDFLAGS=''-Wl,-twolevel_namespace -undefined error -arch \\$ARCHS -Wl,-syslibroot,\\$SDKROOT -mmacosx-version-min=\\$MACOSX_DEPLOYMENT_TARGET -bundle'' "
|
<< " if matlab_ver_less_than('8.1')" << endl
|
||||||
|
<< " 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
|
<< 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;
|
<< basename << "_static.c " << basename << "_static_mex.c')" << endl
|
||||||
mOutputFile << " else" << endl;
|
<< " 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'' "
|
<< " 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
|
<< 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'' "
|
<< " 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;
|
<< basename << "_static.c " << basename << "_static_mex.c')" << endl
|
||||||
mOutputFile << " end" << endl;
|
<< " end" << endl
|
||||||
|
<< " else" << endl
|
||||||
|
<< " eval('mex -O LINKEXPORT='''' " << basename << "_dynamic.c " << basename << "_dynamic_mex.c')" << endl
|
||||||
|
<< " eval('mex -O LINKEXPORT='''' " << basename << "_static.c "<< basename << "_static_mex.c')" << endl
|
||||||
|
<< " end" << endl;
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
mOutputFile << "else" << endl // Octave
|
mOutputFile << "else" << endl // Octave
|
||||||
|
|
Loading…
Reference in New Issue