mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Fix self-contained mode, by looking for ._sc_ and writing data to the bundle directory instead of executable directory.

Browse Source
This commit is contained in:
bruvzg 2022-01-13 21:17:20 +02:00
parent d13c3c9296
commit fff3c38af9
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_paths.cpp
View File

@ -91,6 +91,11 @@ EditorPaths::EditorPaths() {
// Self-contained mode if a `._sc_` or `_sc_` file is present in executable dir.
String exe_path = OS::get_singleton()->get_executable_path().get_base_dir();
// On macOS, look outside .app bundle, since .app bundle is read-only.
if (OS::get_singleton()->has_feature("macos") && exe_path.ends_with("MacOS") && exe_path.plus_file("..").simplify_path().ends_with("Contents")) {
exe_path = exe_path.plus_file("../../..").simplify_path();
}
{
DirAccessRef d = DirAccess::create_for_path(exe_path);

7
modules/mono/godotsharp_dirs.cpp
View File

@ -68,7 +68,14 @@ String _get_mono_user_dir() {
} else {
String settings_path;
// Self-contained mode if a `._sc_` or `_sc_` file is present in executable dir.
String exe_dir = OS::get_singleton()->get_executable_path().get_base_dir();
// On macOS, look outside .app bundle, since .app bundle is read-only.
if (OS::get_singleton()->has_feature("macos") && exe_dir.ends_with("MacOS") && exe_dir.plus_file("..").simplify_path().ends_with("Contents")) {
exe_dir = exe_dir.plus_file("../../..").simplify_path();
}
DirAccessRef d = DirAccess::create_for_path(exe_dir);
if (d->file_exists("._sc_") || d->file_exists("_sc_")) {