ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

forgot to commit

This commit is contained in:
zeromus 2017-07-14 01:02:15 -05:00
parent 60ebaeaaf5
commit af7a2d8b4a
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -51,7 +51,8 @@
<HintPath>..\References\Newtonsoft.Json.dll</HintPath> <HintPath>..\References\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="NLua"> <Reference Include="NLua">
<HintPath>..\References\NLua.dll</HintPath> <HintPath>..\output\dll\nlua\NLua.dll</HintPath>
<Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

6
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -75,8 +75,10 @@
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>..\References\Newtonsoft.Json.dll</HintPath> <HintPath>..\References\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="NLua"> <Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\References\NLua.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\output\dll\nlua\NLua.dll</HintPath>
<Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL"> <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

23
BizHawk.Client.EmuHawk/Program.cs
View File

@ -297,18 +297,37 @@ namespace BizHawk.Client.EmuHawk
static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
{ {
string requested = args.Name;
//mutate filename depending on selection of lua core. here's how it works
//1. we build NLua to the output/dll/lua directory. that brings KopiLua with it
//2. We reference it from there, but we tell it not to copy local; that way there's no NLua in the output/dll directory
//3. When NLua assembly attempts to load, it can't find it
//I. if LuaInterface is selected by the user, we switch to requesting that.
// (those DLLs are built into the output/DLL directory)
//II. if NLua is selected by the user, we skip over this part;
// later, we look for NLua or KopiLua assembly names and redirect them to files located in the output/DLL/nlua directory
if (new AssemblyName(requested).Name == "NLua")
{
if (Global.Config.UseNLua) { }
else requested = "LuaInterface";
}
lock (AppDomain.CurrentDomain) lock (AppDomain.CurrentDomain)
{ {
var asms = AppDomain.CurrentDomain.GetAssemblies(); var asms = AppDomain.CurrentDomain.GetAssemblies();
foreach (var asm in asms) foreach (var asm in asms)
if (asm.FullName == args.Name) if (asm.FullName == requested)
return asm; return asm;
//load missing assemblies by trying to find them in the dll directory //load missing assemblies by trying to find them in the dll directory
string dllname = new AssemblyName(args.Name).Name + ".dll"; string dllname = new AssemblyName(requested).Name + ".dll";
string directory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll"); string directory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
string simpleName = new AssemblyName(requested).Name;
if (simpleName == "NLua" || simpleName == "KopiLua") directory = Path.Combine(directory, "nlua");
string fname = Path.Combine(directory, dllname); string fname = Path.Combine(directory, dllname);
if (!File.Exists(fname)) return null; if (!File.Exists(fname)) return null;
//it is important that we use LoadFile here and not load from a byte array; otherwise mixed (managed/unamanged) assemblies can't load //it is important that we use LoadFile here and not load from a byte array; otherwise mixed (managed/unamanged) assemblies can't load
return Assembly.LoadFile(fname); return Assembly.LoadFile(fname);
} }