aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-20 07:58:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Use CCmdArgs to get program path and search data there

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-01-23 19:04:52 +01:00
parent 482b1ba73a
commit ba7b4094ef
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#include "nel/misc/system_info.h" #include "nel/misc/system_info.h"
#include "nel/misc/block_memory.h" #include "nel/misc/block_memory.h"
#include "nel/misc/system_utils.h" #include "nel/misc/system_utils.h"
#include "nel/misc/cmd_args.h"
// 3D Interface. // 3D Interface.
#include "nel/3d/bloom_effect.h" #include "nel/3d/bloom_effect.h"
#include "nel/3d/u_driver.h" #include "nel/3d/u_driver.h"
@ -616,6 +617,9 @@ void initStereoDisplayDevice()
IStereoDisplay::releaseUnusedLibraries(); IStereoDisplay::releaseUnusedLibraries();
} }
// we want to get executable directory
extern NLMISC::CCmdArgs Args;
static void addPaths(IProgressCallback &progress, const std::vector<std::string> &paths, bool recurse) static void addPaths(IProgressCallback &progress, const std::vector<std::string> &paths, bool recurse)
{ {
// all prefixes for paths // all prefixes for paths
@ -625,19 +629,19 @@ static void addPaths(IProgressCallback &progress, const std::vector<std::string>
directoryPrefixes.push_back(""); directoryPrefixes.push_back("");
#if defined(NL_OS_WINDOWS) #if defined(NL_OS_WINDOWS)
char path[MAX_PATH];
GetModuleFileNameA(GetModuleHandleA(NULL), path, MAX_PATH);
// check in same directory as executable // check in same directory as executable
directoryPrefixes.push_back(CPath::standardizePath(CFile::getPath(path))); directoryPrefixes.push_back(Args.getProgramPath());
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
// check in bundle (Installer) // check in bundle (Installer)
directoryPrefixes.push_back(CPath::standardizePath(getAppBundlePath() + "/Contents/Resources")); directoryPrefixes.push_back(getAppBundlePath() + "/Contents/Resources/");
// check in same directory as bundle (Steam) // check in same directory as bundle (Steam)
directoryPrefixes.push_back(CPath::standardizePath(getAppBundlePath() + "/..")); directoryPrefixes.push_back(CPath::makePathAbsolute(getAppBundlePath() + "/..", ".", true));
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
// TODO: check in same directory as executable // check in same directory as executable
directoryPrefixes.push_back(Args.getProgramPath());
// check in installed directory
if (CFile::isDirectory(getRyzomSharePrefix())) directoryPrefixes.push_back(CPath::standardizePath(getRyzomSharePrefix())); if (CFile::isDirectory(getRyzomSharePrefix())) directoryPrefixes.push_back(CPath::standardizePath(getRyzomSharePrefix()));
#endif #endif