Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

This commit is contained in:
Yorik van Havre 2013-08-30 13:00:52 -03:00
commit e7111b4d10

View File

@ -1385,6 +1385,10 @@ namespace boost { namespace filesystem {
pair<string, string> customSyntax(const string& s)
{
#if defined(FC_OS_MACOSX)
if (s.find("-psn_") == 0)
return make_pair(string("psn"), s.substr(5));
#endif
if (s.find("-display") == 0)
return make_pair(string("display"), string("null"));
else if (s.find("-style") == 0)
@ -1493,6 +1497,9 @@ void Application::ParseOptions(int ac, char ** av)
("visual", boost::program_options::value< string >(), "set the X-Window to color scema")
("ncols", boost::program_options::value< int >(), "set the X-Window to color scema")
("cmap", "set the X-Window to color scema")
#if defined(FC_OS_MACOSX)
("psn", boost::program_options::value< string >(), "process serial number")
#endif
;
// Ignored options, will be savely ignored. Mostly uses by underlaying libs.