games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

VCMIDirs update #5 fix 2

Browse Source 
- Linux compilation fixes
This commit is contained in:
Karol 2014-08-26 15:29:56 +02:00
parent 1b6f2ea3b7
commit a34d148fa3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/VCMIDirs.cpp
View File

@ -335,7 +335,7 @@ class IVCMIDirsUNIX : public IVCMIDirs
}; };
bfs::path IVCMIDirsUNIX::clientPath() const { return binaryPath() / "vcmiclient"; } bfs::path IVCMIDirsUNIX::clientPath() const { return binaryPath() / "vcmiclient"; }
bfs::path IVCMIDirsUNIX::clientPath() const { return binaryPath() / "vcmiserver"; } bfs::path IVCMIDirsUNIX::serverPath() const { return binaryPath() / "vcmiserver"; }
std::string IVCMIDirsUNIX::genHelpString() const std::string IVCMIDirsUNIX::genHelpString() const
{ {
@ -461,7 +461,7 @@ bfs::path VCMIDirsLinux::userDataPath() const
{ {
// $XDG_DATA_HOME, default: $HOME/.local/share // $XDG_DATA_HOME, default: $HOME/.local/share
const char* homeDir; const char* homeDir;
if (homeDir = getenv("XDG_DATA_HOME")) if ((homeDir = getenv("XDG_DATA_HOME")))
return homeDir; return homeDir;
else if (homeDir = getenv("HOME")) else if (homeDir = getenv("HOME"))
return bfs::path(homeDir) / ".local" / "share" / "vcmi"; return bfs::path(homeDir) / ".local" / "share" / "vcmi";
@ -472,9 +472,9 @@ bfs::path VCMIDirsLinux::userCachePath() const
{ {
// $XDG_CACHE_HOME, default: $HOME/.cache // $XDG_CACHE_HOME, default: $HOME/.cache
const char* tempResult; const char* tempResult;
if (tempResult = getenv("XDG_CACHE_HOME")) if ((tempResult = getenv("XDG_CACHE_HOME")))
return bfs::path(tempResult) / "vcmi"; return bfs::path(tempResult) / "vcmi";
else if (tempResult = getenv("HOME")) else if ((tempResult = getenv("HOME")))
return bfs::path(tempResult) / ".cache" / "vcmi"; return bfs::path(tempResult) / ".cache" / "vcmi";
else else
return "."; return ".";
@ -483,9 +483,9 @@ bfs::path VCMIDirsLinux::userConfigPath() const
{ {
// $XDG_CONFIG_HOME, default: $HOME/.config // $XDG_CONFIG_HOME, default: $HOME/.config
const char* tempResult; const char* tempResult;
if (tempResult = getenv("XDG_CONFIG_HOME")) if ((tempResult = getenv("XDG_CONFIG_HOME")))
return bfs::path(tempResult) / "vcmi"; return bfs::path(tempResult) / "vcmi";
else if (tempResult = getenv("HOME")) else if ((tempResult = getenv("HOME")))
return bfs::path(tempResult) / ".config" / "vcmi"; return bfs::path(tempResult) / ".config" / "vcmi";
else else
return "."; return ".";
@ -520,7 +520,7 @@ std::vector<bfs::path> VCMIDirsLinux::dataPaths() const
return ret; return ret;
} }
bfs::path VCMIDirsLinux::libraryPath() const { return M_LIB_PATH; } bfs::path VCMIDirsLinux::libraryPath() const { return M_LIB_DIR; }
bfs::path VCMIDirsLinux::binaryPath() const { return M_BIN_DIR; } bfs::path VCMIDirsLinux::binaryPath() const { return M_BIN_DIR; }
std::string VCMIDirsLinux::libraryName(const std::string& basename) const { return "lib" + basename + ".so"; } std::string VCMIDirsLinux::libraryName(const std::string& basename) const { return "lib" + basename + ".so"; }