diff --git a/Assets/EmuHawkMono.sh b/Assets/EmuHawkMono.sh index 34f0096777..9da2eb3a77 100755 --- a/Assets/EmuHawkMono.sh +++ b/Assets/EmuHawkMono.sh @@ -20,6 +20,7 @@ if [ -z "$libpath" ]; then fi if [ -z "$winepath" ]; then winepath="$libpath/wine"; fi export LD_LIBRARY_PATH="$PWD/dll:$PWD:$winepath:$libpath" +export BIZHAWK_INT_SYSLIB_PATH="$libpath" if [ "$1" = "--mono-no-redirect" ]; then shift printf "(received --mono-no-redirect, stdout was not captured)\n" >EmuHawkMono_laststdout.txt diff --git a/src/BizHawk.Common/IImportResolver.cs b/src/BizHawk.Common/IImportResolver.cs index 44a83082db..7a69230b96 100644 --- a/src/BizHawk.Common/IImportResolver.cs +++ b/src/BizHawk.Common/IImportResolver.cs @@ -24,10 +24,11 @@ namespace BizHawk.Common static DynamicLibraryImportResolver() { var currDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase)?.Replace("file:", "") ?? string.Empty; + var sysLibDir = Environment.GetEnvironmentVariable("BIZHAWK_INT_SYSLIB_PATH") ?? "/usr/lib"; UnixSearchPaths = new[] { $"{currDir}/", $"{currDir}/dll/", - "/usr/lib/bizhawk/", "/usr/lib/", "/usr/lib/mupen64plus/" + $"{sysLibDir}/bizhawk/", $"{sysLibDir}/", $"{sysLibDir}/mupen64plus/" }; }