app_init

Author: ringoz

Runtime/Unity.NodeApi.Native.cpp

@@ -62,8 +62,8 @@ extern "C" void UnityFiberProc()
   imagePath = imagePath.substr(0, imagePath.find_last_of(IL2CPP_DIR_SEPARATOR));
   imagePath = imagePath.substr(0, imagePath.find_last_of(IL2CPP_DIR_SEPARATOR));
   imagePath = imagePath.substr(0, imagePath.find_last_of(IL2CPP_DIR_SEPARATOR));
-  extern void NSBundle_fixup(const char *path);
-  NSBundle_fixup(imagePath.c_str());
+  extern void app_init(const char *path);
+  app_init(imagePath.c_str());
 
   const char *argv[] = { os::Image::GetImageName(), "-logfile", "-" };
   playerProc(1, argv);

Runtime/Unity.NodeApi.Native.mm

@@ -5,6 +5,7 @@
 #include <objc/runtime.h>
 
 static NSBundle *mainBundleFix;
+static auto appKit = [[NSBundle bundleWithPath:@"/System/Library/Frameworks/AppKit.framework"] load];
 
 @implementation NSBundle(BundleFixup)
 
@@ -22,7 +23,7 @@ +(NSBundle *)mainBundleFix
 
 @end
 
-extern "C" void NSBundle_fixup(const char *path)
+extern "C" void app_init(const char *path)
 {
   @autoreleasepool
   {
@@ -45,7 +46,6 @@ +(NSBundle *)mainBundleFix
 {
   @autoreleasepool
   {
-    [[NSBundle bundleWithPath:@"/System/Library/Frameworks/AppKit.framework"] load];
     CADisplayLink *link = [[NSClassFromString(@"NSScreen") mainScreen] displayLinkWithTarget:[^{cb(data);} copy] selector:@selector(invoke)];
     [link addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
   }