From bc5a563d3faaa736bd43e72eae2a664f928afef4 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 28 Oct 2013 13:23:24 +0000 Subject: [PATCH] fix compile error for visual studio 2010 in pce_debugger project, and remove it from the solution file since we aren't using it and I don't want to have to fix random problems like that (left the project and files in SVN) --- BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj | 1 - BizHawk.PCE_Debugger/Mainform.Designer.cs | 3 ++- BizHawk.PCE_Debugger/Mainform.cs | 5 +++++ BizHawk.sln | 14 -------------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj b/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj index aab162983c..c4b0ac22d8 100644 --- a/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj +++ b/BizHawk.PCE_Debugger/BizHawk.PCE_Debugger.csproj @@ -68,7 +68,6 @@ Resources.resx True - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/BizHawk.PCE_Debugger/Mainform.Designer.cs b/BizHawk.PCE_Debugger/Mainform.Designer.cs index 28ee4980bf..b278d965b4 100644 --- a/BizHawk.PCE_Debugger/Mainform.Designer.cs +++ b/BizHawk.PCE_Debugger/Mainform.Designer.cs @@ -57,7 +57,7 @@ // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+F4"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -71,6 +71,7 @@ this.MainMenuStrip = this.menuStrip1; this.Name = "Mainform"; this.Text = "PCE Debugger"; + this.Load += new System.EventHandler(this.Mainform_Load); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.ResumeLayout(false); diff --git a/BizHawk.PCE_Debugger/Mainform.cs b/BizHawk.PCE_Debugger/Mainform.cs index 8ea1f76ea2..f131bdd6c4 100644 --- a/BizHawk.PCE_Debugger/Mainform.cs +++ b/BizHawk.PCE_Debugger/Mainform.cs @@ -20,5 +20,10 @@ namespace BizHawk.PCE_Debugger { Close(); } + + private void Mainform_Load(object sender, EventArgs e) + { + + } } } diff --git a/BizHawk.sln b/BizHawk.sln index 1f1fe47c80..381bbe5954 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizH EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.PCE_Debugger", "BizHawk.PCE_Debugger\BizHawk.PCE_Debugger.csproj", "{2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" @@ -67,18 +65,6 @@ Global {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.ActiveCfg = Release|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.Build.0 = Release|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x86.ActiveCfg = Release|Any CPU - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Debug|Any CPU.ActiveCfg = Debug|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Debug|Win32.ActiveCfg = Debug|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Debug|x86.ActiveCfg = Debug|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Debug|x86.Build.0 = Debug|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Release|Any CPU.ActiveCfg = Release|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Release|Mixed Platforms.Build.0 = Release|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Release|Win32.ActiveCfg = Release|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Release|x86.ActiveCfg = Release|x86 - {2D7F5A4A-C3C4-41CD-839C-C35F3DD58725}.Release|x86.Build.0 = Release|x86 {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU