godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-30 18:30:54 +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

14
drivers/apple_embedded/main_utilities.mm
View File

@@ -52,19 +52,6 @@ void change_to_launch_dir(char **p_args) {
}
}
int add_path(int p_argc, char **p_args) {
NSString *str = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_path"];
if (!str) {
return p_argc;
}
p_args[p_argc++] = (char *)"--path";
p_args[p_argc++] = (char *)[str cStringUsingEncoding:NSUTF8StringEncoding];
p_args[p_argc] = nullptr;
return p_argc;
}
int add_cmdline(int p_argc, char **p_args) {
NSArray *arr = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_cmdline"];
if (!arr) {
@@ -89,7 +76,6 @@ int process_args(int p_argc, char **p_args, char **r_args) {
r_args[i] = p_args[i];
}
r_args[p_argc] = nullptr;
p_argc = add_path(p_argc, r_args);
p_argc = add_cmdline(p_argc, r_args);
return p_argc;
}

1
drivers/apple_embedded/os_apple_embedded.h
View File

@@ -118,6 +118,7 @@ public:
virtual String get_cache_path() const override;
virtual String get_temp_path() const override;
virtual String get_resource_dir() const override;
virtual String get_bundle_resource_dir() const override;
virtual String get_locale() const override;

9
drivers/apple_embedded/os_apple_embedded.mm
View File

@@ -412,6 +412,15 @@ String OS_AppleEmbedded::get_resource_dir() const {
#endif
}
String OS_AppleEmbedded::get_bundle_resource_dir() const {
NSString *str = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"godot_path"];
if (!str) {
return OS_Unix::get_bundle_resource_dir();
} else {
return String::utf8([str cStringUsingEncoding:NSUTF8StringEncoding]);
}
}
String OS_AppleEmbedded::get_locale() const {
NSString *preferredLanguage = [NSLocale preferredLanguages].firstObject;