games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

VCMIDirs: add hack to run from single directory on Mac and Linux

Browse Source 
Also change working directory to where binary is on all platforms except Android
This commit is contained in:
Arseniy Shestakov
2017-08-13 17:20:57 +03:00
parent 40af43c46e
commit fee999300e
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/VCMIDirs.cpp
View File

@@ -452,7 +452,17 @@ bfs::path VCMIDirsOSX::userConfigPath() const { return userDataPath() / "config"
std::vector<bfs::path> VCMIDirsOSX::dataPaths() const
{
return std::vector<bfs::path>(1, "../Resources/Data");
std::vector<bfs::path> ret;
//FIXME: need some proper codepath for detecting running from build output directory
if(bfs::exists("config") && bfs::exists("Mods") && bfs::exists("vcmiserver"))
{
ret.push_back(".");
}
else
{
ret.push_back("../Resources/Data");
}
return ret;
}
bfs::path VCMIDirsOSX::libraryPath() const { return "."; }
@@ -521,7 +531,13 @@ std::vector<bfs::path> VCMIDirsXDG::dataPaths() const
const char* tempResult;
ret.push_back(M_DATA_DIR);
if ((tempResult = getenv("XDG_DATA_DIRS")) != nullptr)
//FIXME: need some proper codepath for detecting running from build output directory
if(bfs::exists("config") && bfs::exists("Mods") && bfs::exists("vcmiserver"))
{
//For now we'll disable usage of system directories when VCMI running from bin directory
ret.push_back(".");
}
else if((tempResult = getenv("XDG_DATA_DIRS")) != nullptr)
{
std::string dataDirsEnv = tempResult;
std::vector<std::string> dataDirs;