From 77f3d4bacf87afed54cb98a68ad311bfe80c00b5 Mon Sep 17 00:00:00 2001
From: player-03 <player3.14@gmail.com>
Date: Sat, 1 Apr 2023 11:20:05 -0400
Subject: [PATCH] Improve "Could not find NekoAPI interface" message.

This message comes up relatively often when a new user tries to set up Lime, but fails to give any instructions a new user could use.

This commit adds a new message explaining the most common issue and how to solve it. It also provides file paths, which may help with more in-depth debugging.
---
 src/lime/system/CFFI.hx | 45 +++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/lime/system/CFFI.hx b/src/lime/system/CFFI.hx
index 4f36f0306..c6e7be02a 100644
--- a/src/lime/system/CFFI.hx
+++ b/src/lime/system/CFFI.hx
@@ -280,34 +280,35 @@ class CFFI
 	{
 		if (!__loadedNekoAPI)
 		{
+			var init:Dynamic;
 			try
 			{
-				var init = load("lime", "neko_init", 5);
-
-				if (init != null)
-				{
-					__loaderTrace("Found nekoapi @ " + __moduleNames.get("lime"));
-					init(function(s) return new String(s), function(len:Int)
-					{
-						var r = [];
-						if (len > 0) r[len - 1] = null;
-						return r;
-					}, null, true, false);
-				}
-				else if (!lazy)
-				{
-					throw("Could not find NekoAPI interface.");
-				}
+				init = load("lime", "neko_init", 5);
 			}
-			catch (e:Dynamic)
+			catch (e)
 			{
-				if (!lazy)
-				{
-					throw("Could not find NekoAPI interface.");
-				}
 			}
 
-			__loadedNekoAPI = true;
+			if (init != null)
+			{
+				__loaderTrace("Found nekoapi @ " + __moduleNames.get("lime"));
+				init(function(s) return new String(s), function(len:Int)
+				{
+					var r = [];
+					if (len > 0) r[len - 1] = null;
+					return r;
+				}, null, true, false);
+
+				__loadedNekoAPI = true;
+			}
+			else if (!lazy)
+			{
+				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.";
+			}
 		}
 	}
 	#end