mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 09:19:01 +00:00
Changed: Support special bundle structure for OS X client
--HG-- branch : develop
This commit is contained in:
parent
1a3a0911e3
commit
8caac6363f
2 changed files with 18 additions and 1 deletions
|
@ -593,6 +593,11 @@ bool CConfigFile::areRyzomDataInstalledIn(const QString &directory) const
|
||||||
|
|
||||||
QDir dir(directory);
|
QDir dir(directory);
|
||||||
|
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
// under OS X, data are in Ryzom.app/Contents/Resources
|
||||||
|
if (!dir.cd("Ryzom.app") || !dir.cd("Contents") || !dir.cd("Resources")) return false;
|
||||||
|
#endif
|
||||||
|
|
||||||
// directory doesn't exist
|
// directory doesn't exist
|
||||||
if (!dir.exists()) return false;
|
if (!dir.exists()) return false;
|
||||||
|
|
||||||
|
@ -643,6 +648,11 @@ bool CConfigFile::isRyzomClientInstalledIn(const QString &directory) const
|
||||||
{
|
{
|
||||||
// client 3.0+
|
// client 3.0+
|
||||||
|
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
// under OS X, client_default.cfg is in Ryzom.app/Contents/Resources
|
||||||
|
if (!dir.cd("Ryzom.app") || !dir.cd("Contents") || !dir.cd("Resources")) return false;
|
||||||
|
#endif
|
||||||
|
|
||||||
// client_default.cfg doesn't exist
|
// client_default.cfg doesn't exist
|
||||||
if (!dir.exists("client_default.cfg")) return false;
|
if (!dir.exists("client_default.cfg")) return false;
|
||||||
|
|
||||||
|
|
|
@ -547,9 +547,16 @@ void COperationDialog::extractDownloadedData()
|
||||||
|
|
||||||
m_currentOperation = tr("Extracting data required by server %1...").arg(server.name);
|
m_currentOperation = tr("Extracting data required by server %1...").arg(server.name);
|
||||||
|
|
||||||
|
QString dest = server.getDirectory();
|
||||||
|
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
// under OS X, data should be uncompressed in Ryzom.app/Contents/Resources
|
||||||
|
dest += "/Ryzom.app/Contents/Resources";
|
||||||
|
#endif
|
||||||
|
|
||||||
CFilesExtractor extractor(this);
|
CFilesExtractor extractor(this);
|
||||||
extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.dataDownloadFilename);
|
extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.dataDownloadFilename);
|
||||||
extractor.setDestinationDirectory(server.getDirectory());
|
extractor.setDestinationDirectory(dest);
|
||||||
|
|
||||||
if (extractor.exec())
|
if (extractor.exec())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue