Added UserLibs folder as Native Library Search Directory #185

LavaGang · Oct 11, 2024 · 950f092 · 950f092
1 parent e239e7a
commit 950f092
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/MelonLoader/MelonUtils.cs b/MelonLoader/MelonUtils.cs
@@ -45,6 +45,7 @@ internal static void Setup(AppDomain domain)
 
             if (!Directory.Exists(MelonEnvironment.UserLibsDirectory))
                 Directory.CreateDirectory(MelonEnvironment.UserLibsDirectory);
+            AddNativeDLLDirectory(MelonEnvironment.UserLibsDirectory);
 
             MelonHandler.Setup();
             UnityInformationHandler.Setup();
@@ -485,6 +486,21 @@ public static string GetFileProductName(string filepath)
             return null;
         }
 
+        public static void AddNativeDLLDirectory(string path)
+        {
+            if (!IsWindows && !IsUnix)
+                return;
+
+            path = Path.GetFullPath(path);
+            if (!Directory.Exists(path))
+                return;
+
+            string envName = IsWindows ? "PATH" : "LD_LIBRARY_PATH";
+            string envSep = IsWindows ? ";" : ":";
+            string envPaths = Environment.GetEnvironmentVariable(envName);
+            Environment.SetEnvironmentVariable(envName, $"{envPaths}{envSep}{path}");
+        }
+
         internal static void SetupWineCheck()
         {
             if (IsUnix || IsMac)
@@ -504,7 +520,6 @@ internal static void SetupWineCheck()
             );
         }
 
-
         [DllImport("ntdll.dll", SetLastError = true)]
         internal static extern uint RtlGetVersion(out OsVersionInfo versionInformation); // return type should be the NtStatus enum