mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity

Fix platform functions for macOS

Browse Source
This commit is contained in:
Richard Jenkins
2018-01-29 00:03:00 +00:00
committed by Ted John
parent 87cd9f88b3
commit 172b5907fa
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/openrct2/platform/Platform.macOS.cpp → src/openrct2/platform/Platform.macOS.mm
View File

@@ -16,7 +16,11 @@
#if defined(__APPLE__) && defined(__MACH__)
#include <Foundation/Foundation.h>
#include <mach-o/dyld.h>
#include "../core/Path.hpp"
#include "../OpenRCT2.h"
#include "Platform2.h"
namespace Platform
@@ -45,19 +49,37 @@ namespace Platform
return std::string();
}
static std::string GetBundlePath()
{
@autoreleasepool
{
NSBundle * bundle = [NSBundle mainBundle];
if (bundle)
{
auto resources = bundle.resourcePath.UTF8String;
if (Path::DirectoryExists(resources))
{
return resources;
}
}
return std::string();
}
}
std::string GetInstallPath()
{
auto path = std::string(gCustomOpenrctDataPath);
if (!path.empty())
{
path = Path::GetAbsolute(customPath);
path = Path::GetAbsolute(path);
}
else
{
auto exePath = GetCurrentExecutablePath();
auto exeDirectory = Path::GetDirectory(exePath);
path = Path::Combine(exeDirectory, "data");
if (!Directory::Exists(path))
NSString * nsPath = [NSString stringWithUTF8String:path.c_str()];
if (![[NSFileManager defaultManager] fileExistsAtPath:nsPath])
{
path = GetBundlePath();
if (path.empty())
@@ -83,23 +105,6 @@ namespace Platform
return std::string();
}
}
static std::string GetBundlePath()
{
@autoreleasepool
{
NSBundle * bundle = [NSBundle mainBundle];
if (bundle)
{
auto resources = bundle.resourcePath.UTF8String;
if (Path::DirectoryExists(resources))
{
return resources;
}
}
return std::string();
}
}
}
#endif