diff options
Diffstat (limited to 'src/filesystem/filesystem.cc')
| -rw-r--r-- | src/filesystem/filesystem.cc | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/filesystem/filesystem.cc b/src/filesystem/filesystem.cc index 11ece3c..d268ccc 100644 --- a/src/filesystem/filesystem.cc +++ b/src/filesystem/filesystem.cc @@ -45,8 +45,7 @@ SearchPath & searchpath() { return filesystem_searchpath; } - -void init(std::string const & basename, std::string const & modname) +void init(const std::string &binaryname, const std::string & basename, const std::string & modname) { con_print << "^BInitializing filesystem..." << std::endl; @@ -95,8 +94,21 @@ void init(std::string const & basename, std::string const & modname) filesystem_homedir += '/'; } #endif - - std::string current_datadir("data/"); + + // try the data/ subdirectory of the directory where the binary is located + std::string current_datadir(binaryname); + size_t i = current_datadir.size(); + while (--i && (current_datadir[i] != '/')) { + current_datadir.erase(i, 1); + } + current_datadir.append("data/"); + + // use the data/ subdirectory of the current working directory as a fallback + if (!sys::directory_exists(current_datadir)) { + current_datadir.assign("data/"); + } + + // the data dir set by the configure script std::string package_datadir(PACKAGE_DATADIR); std::string dir; |