Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Append getAppBundlePath() to search paths under OS X

Browse source
This commit is contained in:
kervala 2015-01-11 14:59:15 +01:00
parent ef405c2f87
commit c90a3049c4
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/client/src/init.cpp
View file

@ -664,6 +664,7 @@ void addSearchPaths(IProgressCallback &progress)
CPath::loadRemappedFiles("remap_files.csv"); CPath::loadRemappedFiles("remap_files.csv");
} }
for (uint i = 0; i < ClientCfg.DataPathNoRecurse.size(); i++) for (uint i = 0; i < ClientCfg.DataPathNoRecurse.size(); i++)
{ {
progress.progress ((float)i/(float)ClientCfg.DataPathNoRecurse.size()); progress.progress ((float)i/(float)ClientCfg.DataPathNoRecurse.size());
@ -673,6 +674,17 @@ void addSearchPaths(IProgressCallback &progress)
progress.popCropedValues (); progress.popCropedValues ();
} }
// add in last position, a specific possibly read only directory
std::string defaultDirectory;
#ifdef NL_OS_MAC
defaultDirectory = getAppBundlePath() + "/Contents/Resources/data";
#elif defined(NL_OS_UNIX) && defined(RYZOM_SHARE_PREFIX)
defaultDirectory = std::string(RYZOM_SHARE_PREFIX) + "/data";
#endif
if (!defaultDirectory.empty()) CPath::addSearchPath(defaultDirectory, true, false);
} }
void addPreDataPaths(NLMISC::IProgressCallback &progress) void addPreDataPaths(NLMISC::IProgressCallback &progress)