Fix portable mode on macOS (#552)

This commit is contained in:
squidbus
2025-03-23 12:23:44 -07:00
committed by GitHub
parent 1c8668fb65
commit 3d3524ffe7
4 changed files with 19 additions and 6 deletions
+1 -3
View File
@@ -25,9 +25,7 @@ namespace zelda64 {
std::filesystem::path get_asset_path(const char* asset) {
std::filesystem::path base_path = "";
#if defined(__APPLE__)
const char* resource_dir = get_bundle_resource_directory();
base_path = resource_dir;
free((void*)resource_dir);
base_path = get_bundle_resource_directory();
#endif
return base_path / "assets" / asset;
+7 -2
View File
@@ -12,9 +12,14 @@ namespace zelda64 {
});
}
const char* get_bundle_resource_directory() {
std::filesystem::path get_bundle_resource_directory() {
NSString *bundlePath = [[NSBundle mainBundle] resourcePath];
return strdup([bundlePath UTF8String]);
return std::filesystem::path([bundlePath UTF8String]);
}
std::filesystem::path get_bundle_directory() {
NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
return std::filesystem::path([bundlePath UTF8String]);
}
}