epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macOS compat build dock icon, app name, dark mode support.

Browse Source
This commit is contained in:
Paul Chote
2021-08-20 12:14:23 +01:00
committed by teinarss
parent f70457a66f
commit d2257f9784
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packaging/macos/launcher-mono.m
View File

@@ -241,8 +241,6 @@ static int check_mono_version(const char *version, const char *req_version)
NSString *exePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"Contents/MacOS/"]; NSString *exePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"Contents/MacOS/"];
NSString *gamePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"Contents/Resources/"]; NSString *gamePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"Contents/Resources/"];
NSString *launchPath = [SYSTEM_MONO_PATH stringByAppendingPathComponent: @"Commands/mono"];
NSString *appPath = [exePath stringByAppendingPathComponent: @"Launcher"]; NSString *appPath = [exePath stringByAppendingPathComponent: @"Launcher"];
NSString *engineLaunchPath = [self resolveTranslocatedPath: appPath]; NSString *engineLaunchPath = [self resolveTranslocatedPath: appPath];
@@ -263,7 +261,7 @@ static int check_mono_version(const char *version, const char *req_version)
gameTask = [[NSTask alloc] init]; gameTask = [[NSTask alloc] init];
[gameTask setCurrentDirectoryPath: gamePath]; [gameTask setCurrentDirectoryPath: gamePath];
[gameTask setLaunchPath: launchPath]; [gameTask setLaunchPath: appPath];
[gameTask setArguments: launchArgs]; [gameTask setArguments: launchArgs];
[[NSNotificationCenter defaultCenter] [[NSNotificationCenter defaultCenter]
@@ -345,6 +343,35 @@ static int check_mono_version(const char *version, const char *req_version)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if (argc > 1)
{
struct rlimit limit;
if (getrlimit (RLIMIT_NOFILE, &limit) == 0 && limit.rlim_cur < 1024)
{
limit.rlim_cur = MIN(limit.rlim_max, 1024);
setrlimit(RLIMIT_NOFILE, &limit);
}
void *libmono = dlopen([[SYSTEM_MONO_PATH stringByAppendingPathComponent: @"/lib/libmonosgen-2.0.dylib"] UTF8String], RTLD_LAZY);
if (libmono == NULL)
{
fprintf (stderr, "Failed to load libmonosgen-2.0.dylib: %s\n", dlerror());
return EXIT_FAILURE;
}
mono_main _mono_main = (mono_main)dlsym(libmono, "mono_main");
if (!_mono_main)
{
fprintf(stderr, "Could not load mono_main(): %s\n", dlerror());
return EXIT_FAILURE;
}
[pool drain];
return _mono_main(argc, argv);
}
NSApplication *application = [NSApplication sharedApplication]; NSApplication *application = [NSApplication sharedApplication];
OpenRALauncher *launcher = [[OpenRALauncher alloc] init]; OpenRALauncher *launcher = [[OpenRALauncher alloc] init];
[NSApp setActivationPolicy: NSApplicationActivationPolicyProhibited]; [NSApp setActivationPolicy: NSApplicationActivationPolicyProhibited];