use NLua+KopiLua instead of LuaInterface
This commit is contained in:
parent
fb7e44642a
commit
3417453b43
|
@ -46,13 +46,13 @@
|
|||
<Reference Include="Ionic.Zip">
|
||||
<HintPath>..\References\Ionic.Zip.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="LuaInterface">
|
||||
<HintPath>..\References\x64\LuaInterface.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\References\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NLua">
|
||||
<HintPath>..\References\NLua.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
|
||||
|
@ -160,6 +160,7 @@
|
|||
<Compile Include="lua\EnvironmentSandbox.cs" />
|
||||
<Compile Include="lua\LuaAttributes.cs" />
|
||||
<Compile Include="lua\LuaDocumentation.cs" />
|
||||
<Compile Include="lua\LuaExtensions.cs" />
|
||||
<Compile Include="lua\LuaFile.cs" />
|
||||
<Compile Include="lua\LuaFileList.cs" />
|
||||
<Compile Include="lua\LuaFunctionList.cs" />
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
|
|
|
@ -9,7 +9,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem;
|
|||
using BizHawk.Emulation.Cores.WonderSwan;
|
||||
using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.Linq;
|
||||
using System.ComponentModel;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Common.IEmulatorExtensions;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
using System;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
using System;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Common.IEmulatorExtensions;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Common.IEmulatorExtensions;
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Cores.Nintendo.NES;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
using BizHawk.Emulation.Common;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Emulation.Cores.Nintendo.SNES;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.Collections;
|
||||
using System.ComponentModel;
|
||||
using System.Data.SQLite;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Client.Common;
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
public bool Enabled => State != RunState.Disabled;
|
||||
public bool Paused => State == RunState.Paused;
|
||||
public bool IsSeparator { get; }
|
||||
public LuaInterface.Lua Thread { get; set; }
|
||||
public NLua.Lua Thread { get; set; }
|
||||
public bool FrameWaiting { get; set; }
|
||||
public string CurrentDirectory { get; set; }
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Drawing;
|
|||
using System.Linq;
|
||||
using System.Threading;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Common.ReflectionExtensions;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
using System;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Common.IEmulatorExtensions;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
// TODO - evaluate for re-entrancy problems
|
||||
namespace BizHawk.Client.Common
|
||||
|
@ -92,7 +92,7 @@ namespace BizHawk.Client.Common
|
|||
|
||||
EnvironmentSandbox.Sandbox(callback);
|
||||
}
|
||||
catch (LuaException ex)
|
||||
catch (NLua.Exceptions.LuaException ex)
|
||||
{
|
||||
Console.WriteLine(ex);
|
||||
DefaultLogger(ex.ToString());
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
using System;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.Common
|
||||
{
|
||||
|
|
|
@ -70,14 +70,14 @@
|
|||
<Reference Include="ICSharpCode.SharpZipLib">
|
||||
<HintPath>..\References\ICSharpCode.SharpZipLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="LuaInterface">
|
||||
<HintPath>..\References\x64\LuaInterface.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Microsoft.VisualBasic" Condition=" '$(OS)' == 'Windows_NT' " />
|
||||
<Reference Include="Newtonsoft.Json">
|
||||
<HintPath>..\References\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NLua">
|
||||
<HintPath>..\References\NLua.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\References\OpenTK.dll</HintPath>
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Common;
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Client.Common;
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.Linq;
|
|||
using System.Text;
|
||||
|
||||
using BizHawk.Client.Common;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.EmuHawk
|
||||
{
|
||||
|
|
|
@ -6,7 +6,7 @@ using System.Linq;
|
|||
using System.Windows.Forms;
|
||||
|
||||
using BizHawk.Client.Common;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.EmuHawk
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||
using System.Drawing;
|
||||
using System.IO;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Client.Common;
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Linq;
|
|||
using System.Windows.Forms;
|
||||
|
||||
using BizHawk.Client.Common;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
namespace BizHawk.Client.EmuHawk
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Client.Common;
|
||||
|
||||
namespace BizHawk.Client.EmuHawk
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.ComponentModel;
|
||||
using System.Drawing;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using BizHawk.Client.Common;
|
||||
|
||||
namespace BizHawk.Client.EmuHawk
|
||||
|
|
|
@ -5,7 +5,7 @@ using System.Linq;
|
|||
using System.Reflection;
|
||||
using System.Threading;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Common.ReflectionExtensions;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
@ -199,10 +199,10 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
var execResult = script.Resume(0);
|
||||
|
||||
_lua.RunScheduledDisposes();
|
||||
//_lua.RunScheduledDisposes();
|
||||
|
||||
// not sure how this is going to work out, so do this too
|
||||
script.RunScheduledDisposes();
|
||||
//script.RunScheduledDisposes();
|
||||
|
||||
_currThread = null;
|
||||
var result = new ResumeResult();
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.Windows.Forms;
|
|||
using System.IO;
|
||||
|
||||
using BizHawk.Client.Common;
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Windows.Forms;
|
||||
|
||||
using LuaInterface;
|
||||
using NLua;
|
||||
|
||||
using BizHawk.Client.Common;
|
||||
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue