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

Merge pull request #2 from TASVideos/master 

sync up
This commit is contained in:
alyosha-tas 2016-05-27 08:56:25 -04:00
parent d5c4d2f037 96416e13d9
commit 24b0ebb924
13 changed files with 88 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
BizHawk.Client.EmuHawk/BizBox.Designer.cs generated
View File

@ -32,20 +32,15 @@
this.OK = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label27 = new System.Windows.Forms.Label();
this.label37 = new System.Windows.Forms.Label();
this.CoreInfoPanel = new System.Windows.Forms.Panel();
this.textBox1 = new System.Windows.Forms.TextBox();
this.VersionLabel = new System.Windows.Forms.Label();
this.btnCopyHash = new System.Windows.Forms.Button();
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.linkLabel3 = new System.Windows.Forms.LinkLabel();
this.DateLabel = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
@ -83,24 +78,6 @@
this.linkLabel1.Text = "Bizhawk Homepage";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(198, 84);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(46, 13);
this.label1.TabIndex = 3;
this.label1.Text = "Authors:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(198, 99);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(149, 13);
this.label2.TabIndex = 4;
this.label2.Text = "vecna, adelikat, zeromus, natt";
//
// label3
//
this.label3.AutoSize = true;
@ -121,51 +98,6 @@
this.label4.TabIndex = 6;
this.label4.Text = "\"A multi-platform emulator...\r\nfor productive people.\"";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(198, 119);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(66, 13);
this.label5.TabIndex = 8;
this.label5.Text = "Contributors:";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(198, 133);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(220, 13);
this.label6.TabIndex = 9;
this.label6.Text = "DarkKobold, Micro500, TaoTao, Rolanmen1,";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(198, 147);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(216, 13);
this.label7.TabIndex = 10;
this.label7.Text = "Deign, Brandon Evans, Pasky13, link_7777,";
//
// label27
//
this.label27.AutoSize = true;
this.label27.Location = new System.Drawing.Point(198, 161);
this.label27.Name = "label27";
this.label27.Size = new System.Drawing.Size(201, 13);
this.label27.TabIndex = 12;
this.label27.Text = "SaxxonPike, MasterofPuppets, Scepheo,";
//
// label37
//
this.label37.AutoSize = true;
this.label37.Location = new System.Drawing.Point(198, 176);
this.label37.Name = "label37";
this.label37.Size = new System.Drawing.Size(96, 13);
this.label37.TabIndex = 13;
this.label37.Text = "null_ptr, MightyMar";
//
// CoreInfoPanel
//
this.CoreInfoPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -194,11 +126,11 @@
// VersionLabel
//
this.VersionLabel.AutoSize = true;
this.VersionLabel.Location = new System.Drawing.Point(198, 66);
this.VersionLabel.Location = new System.Drawing.Point(198, 75);
this.VersionLabel.Name = "VersionLabel";
this.VersionLabel.Size = new System.Drawing.Size(104, 13);
this.VersionLabel.Size = new System.Drawing.Size(108, 13);
this.VersionLabel.TabIndex = 7;
this.VersionLabel.Text = "timestamp goes here";
this.VersionLabel.Text = "versioninfo goes here";
//
// btnCopyHash
//
@ -225,6 +157,27 @@
this.linkLabel2.Text = "Commit #XXXXXXX";
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
//
// linkLabel3
//
this.linkLabel3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.linkLabel3.AutoSize = true;
this.linkLabel3.Location = new System.Drawing.Point(198, 112);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(63, 13);
this.linkLabel3.TabIndex = 20;
this.linkLabel3.TabStop = true;
this.linkLabel3.Text = "Contributers";
this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked);
//
// DateLabel
//
this.DateLabel.AutoSize = true;
this.DateLabel.Location = new System.Drawing.Point(198, 91);
this.DateLabel.Name = "DateLabel";
this.DateLabel.Size = new System.Drawing.Size(104, 13);
this.DateLabel.TabIndex = 21;
this.DateLabel.Text = "timestamp goes here";
//
// BizBox
//
this.AcceptButton = this.OK;
@ -232,20 +185,15 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.OK;
this.ClientSize = new System.Drawing.Size(448, 536);
this.Controls.Add(this.DateLabel);
this.Controls.Add(this.linkLabel3);
this.Controls.Add(this.linkLabel2);
this.Controls.Add(this.btnCopyHash);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.CoreInfoPanel);
this.Controls.Add(this.label37);
this.Controls.Add(this.label27);
this.Controls.Add(this.label7);
this.Controls.Add(this.label6);
this.Controls.Add(this.label5);
this.Controls.Add(this.VersionLabel);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.linkLabel1);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.OK);
@ -266,19 +214,14 @@
private System.Windows.Forms.Button OK;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label27;
private System.Windows.Forms.Label label37;
private System.Windows.Forms.Panel CoreInfoPanel;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label VersionLabel;
private System.Windows.Forms.Button btnCopyHash;
private System.Windows.Forms.LinkLabel linkLabel2;
private System.Windows.Forms.LinkLabel linkLabel3;
private System.Windows.Forms.Label DateLabel;
}
}

10
BizHawk.Client.EmuHawk/BizBox.cs
View File

@ -38,7 +38,8 @@ namespace BizHawk.Client.EmuHawk
Text = "Version " + mainversion + " (GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH + ")";
}
VersionLabel.Text = "Version " + mainversion + " " + VersionInfo.RELEASEDATE;
VersionLabel.Text = "Version " + mainversion;
DateLabel.Text = VersionInfo.RELEASEDATE;
var cores = Assembly
.Load("BizHawk.Emulation.Cores")
@ -50,7 +51,7 @@ namespace BizHawk.Client.EmuHawk
.OrderByDescending(a => a.CoreName.ToLower())
.ToList();
foreach(var core in cores)
foreach (var core in cores)
{
CoreInfoPanel.Controls.Add(new BizBoxInfoControl(core)
{
@ -71,5 +72,10 @@ namespace BizHawk.Client.EmuHawk
{
System.Windows.Forms.Clipboard.SetText(SubWCRev.GIT_SHORTHASH);
}
private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start("https://github.com/TASVideos/BizHawk/commit/" + SubWCRev.GIT_SHORTHASH);
}
}
}

4
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -2871,6 +2871,10 @@ namespace BizHawk.Client.EmuHawk
}
}
}
else
{
atten = 0;
}
if (Global.ClientControls["Rewind"] || PressRewind)
{

5
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -328,6 +328,7 @@
<Compile Include="Consoles\Atari\2600\Mappers\mF6SC.cs" />
<Compile Include="Consoles\Atari\2600\Mappers\mF8.cs" />
<Compile Include="Consoles\Atari\2600\Mappers\mF8SC.cs" />
<Compile Include="Consoles\Atari\2600\Mappers\mF8_sega.cs" />
<Compile Include="Consoles\Atari\2600\Mappers\mFA.cs" />
<Compile Include="Consoles\Atari\2600\Mappers\mFA2.cs" />
<Compile Include="Consoles\Atari\2600\Mappers\mFE.cs" />
@ -438,8 +439,8 @@
</Compile>
<Compile Include="Consoles\Nintendo\Gameboy\GambatteLink.cs" />
<Compile Include="Consoles\Nintendo\Gameboy\GambatteLink.ICodeDataLog.cs">
<DependentUpon>GambatteLink.cs</DependentUpon>
</Compile>
<DependentUpon>GambatteLink.cs</DependentUpon>
</Compile>
<Compile Include="Consoles\Nintendo\Gameboy\GambatteLink.IDebuggable.cs">
<DependentUpon>GambatteLink.cs</DependentUpon>
</Compile>

18
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8_sega.cs
View File

@ -2,24 +2,14 @@
namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
/*
F8 (Atari style 8K)
/*
F8 Sega
-----
This is the fairly standard way 8K of cartridge ROM was implemented. There are two
4K ROM banks, which get mapped into the 4K of cartridge space. Accessing 1FF8 or
1FF9 selects one of the two 4K banks. When one of these two addresses are accessed,
the banks switch spontaniously.
ANY kind of access will trigger the switching- reading or writing. Usually games use
LDA or BIT on 1FF8/1FF9 to perform the switch.
When the switch occurs, the entire 4K ROM bank switches, including the code that is
reading the 1FF8/1FF9 location. Usually, games put a small stub of code in BOTH banks
so when the switch occurs, the code won't crash.
Apparently some of Sega's games have banks that are physically flipped, so even though this game uses a common mapper, the initial bank that gets pointed to is incorrect.
*/
internal class mF8_sega : MapperBase
internal class mF8_sega : MapperBase
{
private int _bank4K=1;

22
LuaInterface/Lua/src/LuaDLL.cpp
View File

@ -707,16 +707,22 @@ namespace Lua511
static int luaL_loadbuffer(IntPtr luaState, String^ buff, String^ name)
{
char *cs1 = (char *) Marshal::StringToHGlobalAnsi(buff).ToPointer();
char *cs2 = (char *) Marshal::StringToHGlobalAnsi(name).ToPointer();
//zero 23-may-2016 - get rid of this GARBAGE. lua can load UTF-8, why not use that?
//char *cs1 = (char *) Marshal::StringToHGlobalAnsi(buff).ToPointer();
//char *cs2 = (char *) Marshal::StringToHGlobalAnsi(name).ToPointer();
////CP: fix for MBCS, changed to use cs1's length (reported by qingrui.li)
//int result = ::luaL_loadbuffer(toState, cs1, strlen(cs1), cs2);
//Marshal::FreeHGlobal(IntPtr(cs1));
//Marshal::FreeHGlobal(IntPtr(cs2));
//CP: fix for MBCS, changed to use cs1's length (reported by qingrui.li)
int result = ::luaL_loadbuffer(toState, cs1, strlen(cs1), cs2);
array<System::Byte> ^ _buff = System::Text::Encoding::UTF8->GetBytes(buff);
array<System::Byte> ^ _name = System::Text::Encoding::UTF8->GetBytes(name);
char* lbuff = "", *lname = nullptr;
pin_ptr<System::Byte> p_buff, p_name;
if(buff->Length != 0) { p_buff = &_buff[0]; lbuff = (char*)(System::Byte*)p_buff; }
if(name->Length != 0) { p_name= &_name[0]; lname = (char*)(System::Byte*)p_name; }
Marshal::FreeHGlobal(IntPtr(cs1));
Marshal::FreeHGlobal(IntPtr(cs2));
return result;
return ::luaL_loadbuffer(toState, lbuff, _buff->Length, lname);
}
static int luaL_loadfile(IntPtr luaState, String^ filename)

5
LuaInterface/Lua/src/lua514.vcxproj
View File

@ -435,4 +435,9 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties />
</VisualStudio>
</ProjectExtensions>
</Project>

51
LuaInterface/LuaInterface.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "Lua\src\lua514.vcxproj", "{0A82CC4C-9A27-461C-8DB0-A65AC6393748}"
EndProject
@ -9,66 +9,33 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInterface", "LuaInterfac
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|x86 = Release|x86
Release-LUAPERKS|Any CPU = Release-LUAPERKS|Any CPU
Release-LUAPERKS|Mixed Platforms = Release-LUAPERKS|Mixed Platforms
Release-LUAPERKS|Win32 = Release-LUAPERKS|Win32
Release-LUAPERKS|x64 = Release-LUAPERKS|x64
Release-LUAPERKS|x86 = Release-LUAPERKS|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Any CPU.ActiveCfg = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Win32.ActiveCfg = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Win32.Build.0 = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|x64.ActiveCfg = Debug|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|x86.ActiveCfg = Debug|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Any CPU.ActiveCfg = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Mixed Platforms.Build.0 = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Win32.ActiveCfg = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Win32.Build.0 = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|x64.Build.0 = Debug|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|x86.ActiveCfg = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|x86.Build.0 = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x64.ActiveCfg = Release|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x64.Build.0 = Release|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x86.ActiveCfg = Release|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Any CPU.ActiveCfg = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Mixed Platforms.ActiveCfg = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Mixed Platforms.Build.0 = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Win32.ActiveCfg = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Win32.Build.0 = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x86.ActiveCfg = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x86.Build.0 = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|x64.ActiveCfg = Release-LUAPERKS|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|x64.Build.0 = Release-LUAPERKS|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|x86.ActiveCfg = Release-LUAPERKS|Win32
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Win32.ActiveCfg = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x64.ActiveCfg = Debug|x64
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x64.Build.0 = Debug|x64
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x86.ActiveCfg = Debug|x86
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Any CPU.Build.0 = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Win32.ActiveCfg = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x86.Build.0 = Debug|x86
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|x64.ActiveCfg = Release|x64
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|x64.Build.0 = Release|x64
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|x86.ActiveCfg = Release|x86
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Any CPU.ActiveCfg = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Any CPU.Build.0 = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Mixed Platforms.ActiveCfg = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Mixed Platforms.Build.0 = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Win32.ActiveCfg = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|x86.Build.0 = Release|x86
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|x64.ActiveCfg = Release-LUAPERKS|x64
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|x64.Build.0 = Release-LUAPERKS|x64
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|x86.ActiveCfg = Release-LUAPERKS|x86

22
LuaInterface/LuaInterface/LuaInterface.csproj
View File

@ -49,7 +49,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\references\</OutputPath>
<OutputPath>..\..\references\x86\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -61,7 +61,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\references\</OutputPath>
<OutputPath>..\..\references\x86\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -86,7 +86,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<OutputPath>..\..\references\x86\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@ -100,7 +100,7 @@
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<OutputPath>..\..\references\x86\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@ -131,7 +131,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<OutputPath>..\..\references\x64\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@ -145,7 +145,7 @@
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<OutputPath>..\..\references\x64\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@ -219,13 +219,13 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Lua\src\lua514.vcxproj">
<Project>{0A82CC4C-9A27-461C-8DB0-A65AC6393748}</Project>
<Name>lua51</Name>
</ProjectReference>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<ProjectReference Include="..\Lua\src\lua514.vcxproj">
<Project>{0a82cc4c-9a27-461c-8db0-a65ac6393748}</Project>
<Name>lua51</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

BIN
References/x64/LuaInterface.dll
View File

Binary file not shown.

BIN
References/x64/lua51.dll
View File

Binary file not shown.

BIN
References/x86/LuaInterface.dll
View File

Binary file not shown.

BIN
References/x86/lua51.dll
View File

Binary file not shown.