summaryrefslogtreecommitdiff
path: root/core/os
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-01-10 18:38:33 +0100
committerGitHub <noreply@github.com>2020-01-10 18:38:33 +0100
commit4b3123104cb766a11a9cb93afb08af118712f012 (patch)
treeb40bbf484fe9d3b28577e3708f79043681128bb5 /core/os
parent140a31728f7e90c9bd1769fe9b35e14bcad6b4d3 (diff)
parentd07cdc594f0d0c0cf56896b6b8d98697871462eb (diff)
Merge pull request #34995 from bruvzg/macos_use_bundle_res_path
[macOS] Fix loading PCK from the .app bundle resources.
Diffstat (limited to 'core/os')
-rw-r--r--core/os/os.cpp6
-rw-r--r--core/os/os.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index edb2416b67..81dea159a6 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -343,6 +343,12 @@ String OS::get_cache_path() const {
return ".";
}
+// Path to macOS .app bundle resources
+String OS::get_bundle_resource_dir() const {
+
+ return ".";
+};
+
// OS specific path for user://
String OS::get_user_data_dir() const {
diff --git a/core/os/os.h b/core/os/os.h
index 593ea2b645..714c4e3f09 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -411,6 +411,7 @@ public:
virtual String get_data_path() const;
virtual String get_config_path() const;
virtual String get_cache_path() const;
+ virtual String get_bundle_resource_dir() const;
virtual String get_user_data_dir() const;
virtual String get_resource_dir() const;