godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-31 18:41:20 +00:00
Code Releases Wiki Activity

Merge pull request #113455 from bruvzg/ios_p

Browse Source 
[iOS] Fix use of `godot_path`.
This commit is contained in:
Thaddeus Crews
2025-12-02 11:52:01 -06:00
parent 8749308796 358d799b9a
commit ec3f304ccc
5 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config/project_settings.cpp
View File

@@ -718,7 +718,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
// We need to test both possibilities as extensions for Linux binaries are optional
// (so both 'mygame.bin' and 'mygame' should be able to find 'mygame.pck').
#ifdef MACOS_ENABLED
#if defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED)
if (!found) {
// Attempt to load PCK from macOS .app bundle resources.
found = _load_resource_pack(OS::get_singleton()->get_bundle_resource_dir().path_join(exec_basename + ".pck"), false, 0, true) || _load_resource_pack(OS::get_singleton()->get_bundle_resource_dir().path_join(exec_filename + ".pck"), false, 0, true);
@@ -777,7 +777,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
return err;
}
#ifdef MACOS_ENABLED
#if defined(MACOS_ENABLED) || defined(APPLE_EMBEDDED_ENABLED)
// Attempt to load project file from macOS .app bundle resources.
resource_path = OS::get_singleton()->get_bundle_resource_dir();
if (!resource_path.is_empty()) {