upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-27 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #440 from pquentin/master

Browse Source 
Fix get_exe_dir on OS X
This commit is contained in:
Ignacio R. Morelle 2015-08-31 02:12:42 -03:00
commit 385cd42215
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/filesystem_boost.cpp
View File

@ -644,17 +644,21 @@ std::string get_cwd()
}
std::string get_exe_dir()
{
#ifndef _WIN32
path self_exe("/proc/self/exe");
error_code ec;
path exe = bfs::read_symlink(self_exe, ec);
if (ec) {
return std::string();
}
return exe.parent_path().string();
#ifdef _WIN32
return get_cwd();
#else
return get_cwd();
if (bfs::exists("/proc/")) {
path self_exe("/proc/self/exe");
error_code ec;
path exe = bfs::read_symlink(self_exe, ec);
if (ec) {
return std::string();
}
return exe.parent_path().string();
} else {
return get_cwd();
}
#endif
}