merge with develop

--HG--
branch : compatibility-develop

code/nel/src/misc/cmd_args.cpp

@@ -172,7 +172,7 @@ bool CCmdArgs::haveAdditionalArg(const std::string &name) const
 
 		// they don't have any short or long name, but need a name in help
 		if (arg.shortName.empty() && arg.longName.empty() && !arg.helpName.empty() && arg.helpName == name && arg.found)
-			return false;
+			return true;
 	}
 
 	return false;

code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp

@@ -75,6 +75,10 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) :
 	item = treeWidget->topLevelItem( 3 )->child( 1 );
 	item->setData( 0, Qt::UserRole, 7 );
 
+#ifndef Q_OS_WIN
+	// Hide Direct3D page under Linux and OS X
+	item->setHidden(true);
+#endif
 
 	CategoryStackedWidget->addWidget( new CGeneralSettingsWidget( CategoryStackedWidget ) );
 	CategoryStackedWidget->addWidget( new CDisplaySettingsWidget( CategoryStackedWidget ) );
@@ -85,6 +89,7 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) :
 	CategoryStackedWidget->addWidget( new CSysInfoOpenGLWidget( CategoryStackedWidget ) );
 
 #ifdef Q_OS_WIN
+	// Add Direct3D widget only under Windows
 	CategoryStackedWidget->addWidget( new CSysInfoD3DWidget( CategoryStackedWidget ) );
 #endif
 
@@ -142,12 +147,10 @@ void CClientConfigDialog::onClickPlay()
 
 #ifdef Q_OS_WIN32
 	started = QProcess::startDetached( "ryzom_client_r.exe" );
-	if( !started )
-		QProcess::startDetached( "ryzom_client_rd.exe" );
 	if( !started )
 		QProcess::startDetached( "ryzom_client_d.exe" );
 #elif defined(Q_OS_MAC)
-	started = QProcess::startDetached( "./Ryzom" );
+	started = QProcess::startDetached( "./Ryzom.app" );
 #else
 	started = QProcess::startDetached( "./ryzom_client" );
 #endif