maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[macOS] Load PCK from the .app bundle resources, instead of changing working directory.

Browse source
This commit is contained in:
bruvzg 2020-01-10 18:02:29 +02:00
parent 140a31728f
commit d07cdc594f
No known key found for this signature in database
GPG key ID: FCED35F1CECE0D3A
6 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/os/os.cpp
View file

@ -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 {

1
core/os/os.h
View file

@ -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;

10
core/project_settings.cpp
View file

@ -383,8 +383,16 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
}
}
// Attempt with PCK bundled into executable
#ifdef OSX_ENABLED
// Attempt to load PCK from macOS .app bundle resources
if (!found) {
if (_load_resource_pack(OS::get_singleton()->get_bundle_resource_dir().plus_file(exec_basename + ".pck"))) {
found = true;
}
}
#endif
// Attempt with PCK bundled into executable
if (!found) {
if (_load_resource_pack(exec_path)) {
found = true;

29
platform/osx/godot_main_osx.mm
View file

@ -45,35 +45,6 @@ int main(int argc, char **argv) {
printf("%i: %s\n", i, argv[i]);
};
if (argc >= 1 && argv[0][0] == '/') {
//potentially launched from finder
int len = strlen(argv[0]);
while (len--) {
if (argv[0][len] == '/') break;
}
if (len >= 0) {
char *path = (char *)malloc(len + 1);
memcpy(path, argv[0], len);
path[len] = 0;
char *pathinfo = (char *)malloc(strlen(path) + strlen("/../Info.plist") + 1);
//in real code you would check for errors in malloc here
strcpy(pathinfo, path);
strcat(pathinfo, "/../Info.plist");
FILE *f = fopen(pathinfo, "rb");
if (f) {
//running from app bundle, as Info.plist was found
fclose(f);
chdir(path);
chdir("../Resources"); //data.pck, or just the files are here
}
free(path);
free(pathinfo);
}
}
#ifdef DEBUG_ENABLED
// lets report the path we made current after all that
char cwd[4096];

1
platform/osx/os_osx.h
View file

@ -223,6 +223,7 @@ public:
virtual String get_config_path() const;
virtual String get_data_path() const;
virtual String get_cache_path() const;
virtual String get_bundle_resource_dir() const;
virtual String get_godot_dir_name() const;
virtual String get_system_dir(SystemDir p_dir) const;

13
platform/osx/os_osx.mm
View file

@ -2111,6 +2111,19 @@ String OS_OSX::get_cache_path() const {
}
}
String OS_OSX::get_bundle_resource_dir() const {
NSBundle *main = [NSBundle mainBundle];
NSString *resourcePath = [main resourcePath];
char *utfs = strdup([resourcePath UTF8String]);
String ret;
ret.parse_utf8(utfs);
free(utfs);
return ret;
}
// Get properly capitalized engine name for system paths
String OS_OSX::get_godot_dir_name() const {