Merge with develop
This commit is contained in:
parent
80cbda23e5
commit
ff2bb04474
1 changed files with 5 additions and 0 deletions
|
@ -948,7 +948,12 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
|
||||||
contentSuffix += "cd \"$STARTUPPATH\"\n\n";
|
contentSuffix += "cd \"$STARTUPPATH\"\n\n";
|
||||||
|
|
||||||
// launch new client
|
// launch new client
|
||||||
|
#ifdef NL_OS_MAC
|
||||||
|
// use exec command under OS X
|
||||||
|
contentSuffix += toString("exec \"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
|
||||||
|
#else
|
||||||
contentSuffix += toString("\"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
|
contentSuffix += toString("\"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue