0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix finding the current exe name on macOS

Browse source
This commit is contained in:
pentarctagon 2024-06-21 00:50:40 -05:00 • committed by Pentarctagon
parent d911a86a8f
commit cc3a02bd32
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/filesystem.cpp
View file

@ -50,6 +50,11 @@
#endif /* !_WIN32 */
#ifdef __APPLE__
#include <mach-o/dyld.h>
#include <limits.h>
#endif
#include <algorithm>
#include <set>
@ -726,7 +731,6 @@ static bfs::path apple_userdata(const std::string& newprefdir)
{
bfs::path dir;
std::string temp = newprefdir;
const char* home_str = getenv("HOME");
// if a custom userdata was not specified
// use the PREFERENCES_DIR if defined
@ -734,6 +738,7 @@ static bfs::path apple_userdata(const std::string& newprefdir)
// else use a default - this is currently the "unsandboxed" location from migrate_apple_config_directory_for_unsandboxed_builds() above
if(temp.empty()) {
#ifdef PREFERENCES_DIR
const char* home_str = getenv("HOME");
temp = PREFERENCES_DIR;
DBG_FS << "userdata using PREFERENCES_DIR '" << PREFERENCES_DIR << "'";
if(home_str && temp[0] == '~') {
@ -1031,6 +1036,16 @@ std::string get_exe_path()
bfs::path exe(process_path);
return exe.string();
#elif defined(__APPLE__)
std::vector<char> buffer(PATH_MAX, 0);
uint32_t size = PATH_MAX;
if(_NSGetExecutablePath(&buffer[0], &size) == 0) {
buffer.resize(size+1);
return std::string(buffer.begin(), buffer.end());
} else {
ERR_FS << "Path to wesnoth executable is too long";
return get_cwd() + "/The Battle for Wesnoth";
}
#else
// first check /proc
if(bfs::exists("/proc/")) {