From 95381faedc760870f05c0f27c182e3b7b25fef04 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 3 Jan 2017 19:01:48 -0500 Subject: [PATCH] fix finding runtime files relative to the executable path --- src/core/Runtime.cc | 4 ++-- src/core/Runtime.h | 2 +- src/jes.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/Runtime.cc b/src/core/Runtime.cc index 9f1b917..1987a92 100644 --- a/src/core/Runtime.cc +++ b/src/core/Runtime.cc @@ -6,9 +6,9 @@ static const std::initializer_list Shader_Extensions = {"", ".glsl static std::string System_Runtime_Dir; -void Runtime::init(const char * argv_0, const char * appname) +void Runtime::init(const char * executable_path, const char * appname) { - System_Runtime_Dir = Path::join(Path::dirname(Path::dirname(argv_0)), "share", appname); + System_Runtime_Dir = Path::join(Path::dirname(Path::dirname(executable_path)), "share", appname); } std::string Runtime::find(Type t, const std::string & name) diff --git a/src/core/Runtime.h b/src/core/Runtime.h index e37983d..1ff8612 100644 --- a/src/core/Runtime.h +++ b/src/core/Runtime.h @@ -14,7 +14,7 @@ public: }; static std::string find(Type t, const std::string & name); - static void init(const char * argv_0, const char * appname); + static void init(const char * executable_path, const char * appname); protected: static std::string find_first_under(const std::string & runtime_subpath, diff --git a/src/jes.cc b/src/jes.cc index 56b460a..ee5506c 100644 --- a/src/jes.cc +++ b/src/jes.cc @@ -11,7 +11,7 @@ int main(int argc, char * argv[]) return 1; } - Runtime::init(argv[0], APPNAME); + Runtime::init(System::executable_path().c_str(), APPNAME); const char * filename = nullptr; if (argc > 1)