Merge pull request #1653 from player-03/lime.ndll-error-message

Improve "Could not find NekoAPI interface" message.
This commit is contained in:
player-03
2023-04-16 17:31:34 -04:00
committed by GitHub

View File

@@ -279,9 +279,14 @@ class CFFI
{ {
if (!__loadedNekoAPI) if (!__loadedNekoAPI)
{ {
var init:Dynamic = null;
try try
{ {
var init = load("lime", "neko_init", 5); init = load("lime", "neko_init", 5);
}
catch (e:Dynamic)
{
}
if (init != null) if (init != null)
{ {
@@ -292,22 +297,18 @@ class CFFI
if (len > 0) r[len - 1] = null; if (len > 0) r[len - 1] = null;
return r; return r;
}, null, true, false); }, null, true, false);
__loadedNekoAPI = true;
} }
else if (!lazy) else if (!lazy)
{ {
throw("Could not find NekoAPI interface."); var ndllFolder = __findHaxelib("lime") + "/ndll/" + __sysName();
throw "Could not find lime.ndll. This file is provided with Lime's Haxelib releases, but not via Git. "
+ "Please copy it from Lime's latest Haxelib release into either "
+ ndllFolder + " or " + ndllFolder + "64, as appropriate for your system. "
+ "Advanced users may run `lime rebuild cpp` instead.";
} }
} }
catch (e:Dynamic)
{
if (!lazy)
{
throw("Could not find NekoAPI interface.");
}
}
__loadedNekoAPI = true;
}
} }
#end #end