diff --git a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj index f1956561bf..e997768444 100644 --- a/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj +++ b/BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj @@ -21,7 +21,6 @@ true pdbonly x64 - ..\output\dll\BizHawk.Client.ApiHawk.dll.CodeAnalysisLog.xml true GlobalSuppressions.cs prompt @@ -44,53 +43,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x86 - - - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - false - - - true - ..\output\dll\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - false - - - ..\output\dll\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - ..\output\dll\BizHawk.Client.ApiHawk.XML - false - diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj index 76765428c3..dfee4f5caf 100644 --- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -14,29 +14,6 @@ 512 - - true - full - false - ..\output\dll\ - TRACE;DEBUG;DOTNET20;UNMANAGED;COMPRESS;WINDOWS - prompt - 4 - true - x86 - false - - - pdbonly - true - ..\output\dll\ - TRACE;DOTNET20;UNMANAGED;COMPRESS;WINDOWS - prompt - 4 - true - x86 - false - true ..\output64\dll\ @@ -44,7 +21,6 @@ true full x64 - ..\output\dll\BizHawk.Client.Common.dll.CodeAnalysisLog.xml true GlobalSuppressions.cs prompt @@ -63,7 +39,6 @@ true pdbonly x64 - ..\output\dll\BizHawk.Client.Common.dll.CodeAnalysisLog.xml true GlobalSuppressions.cs prompt diff --git a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj index a8d0c308ba..bf01577aac 100644 --- a/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj +++ b/BizHawk.Client.DBMan/BizHawk.Client.DBMan.csproj @@ -1,152 +1,127 @@ - - - - - - - true - ..\output64\ - TRACE;DEBUG;WINDOWS - full - x64 - ..\output\BizHawk.Client.DBMan.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - false - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - - - ..\output64\ - TRACE;WINDOWS - true - pdbonly - x64 - ..\output\BizHawk.Client.DBMan.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - false - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - - - - Debug - x86 - {2D2890A8-C338-4439-AD8B-CB9EE85A94F9} - Exe - Properties - BizHawk.Client.DBMan - BizHawk.Client.DBMan - v4.6.1 - 512 - - - - x86 - true - full - false - ..\output\ - TRACE;DEBUG;WINDOWS - prompt - 4 - false - false - - - x86 - pdbonly - true - ..\output\ - TRACE;WINDOWS - prompt - 4 - false - false - - - - .\CSharp-SQLite.dll - - - - - - - - - - - - - - Form - - - DBMan_MainForm.cs - - - - - - - - - DBMan_MainForm.cs - - - ResXFileCodeGenerator + + + + + + + true + ..\output64\ + TRACE;DEBUG;WINDOWS + full + x64 + true + GlobalSuppressions.cs + false + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + true + false + + + ..\output64\ + TRACE;WINDOWS + true + pdbonly + x64 + true + GlobalSuppressions.cs + false + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + + Debug + x86 + {2D2890A8-C338-4439-AD8B-CB9EE85A94F9} + Exe + Properties + BizHawk.Client.DBMan + BizHawk.Client.DBMan + v4.6.1 + 512 + + + + + .\CSharp-SQLite.dll + + + + + + + + + + + + + + Form + + + DBMan_MainForm.cs + + + + + + + + + DBMan_MainForm.cs + + + ResXFileCodeGenerator Resources.Designer.cs - Designer - + Designer + True Resources.resx True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {24a0aa3c-b25f-4197-b23d-476d6462dba0} - BizHawk.Client.Common - - - {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + {24a0aa3c-b25f-4197-b23d-476d6462dba0} + BizHawk.Client.Common + + + {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} + BizHawk.Common + + + {e1a23168-b571-411c-b360-2229e7225e0e} + BizHawk.Emulation.Common + + + {f51946ea-827f-4d82-b841-1f2f6d060312} + BizHawk.Emulation.DiscSystem + + + + --> \ No newline at end of file diff --git a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj index 90a2eb687c..3687bb7994 100644 --- a/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj +++ b/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj @@ -33,32 +33,6 @@ true - - true - full - false - ..\output\ - TRACE;DEBUG;WINDOWS - prompt - 4 - false - AllRules.ruleset - x86 - true - false - - - pdbonly - true - ..\output\ - TRACE;WINDOWS - prompt - 4 - false - x86 - AllRules.ruleset - false - true @@ -75,7 +49,6 @@ true full x64 - ..\output\DiscoHawk.exe.CodeAnalysisLog.xml true GlobalSuppressions.cs false @@ -94,7 +67,6 @@ true pdbonly x64 - ..\output\DiscoHawk.exe.CodeAnalysisLog.xml true GlobalSuppressions.cs false diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 1adf8cab6b..8021a9bb2d 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -36,33 +36,6 @@ false true - - true - full - false - ..\output\ - $(DefineConstants);DEBUG - prompt - 4 - x86 - false - true - AllRules.ruleset - false - - - pdbonly - true - ..\output\ - prompt - 4 - x86 - true - false - AllRules.ruleset - WINDOWS - false - true @@ -73,7 +46,6 @@ true full x64 - ..\output\EmuHawk.exe.CodeAnalysisLog.xml true GlobalSuppressions.cs false @@ -93,7 +65,6 @@ true pdbonly x64 - ..\output\EmuHawk.exe.CodeAnalysisLog.xml true GlobalSuppressions.cs false diff --git a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj b/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj index 1a5f151d66..e93053a989 100644 --- a/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj +++ b/BizHawk.Client.MultiHawk/BizHawk.Client.MultiHawk.csproj @@ -1,283 +1,258 @@ - - - - true - ..\output64\ - TRACE;DEBUG;WINDOWS - true - full - x64 - ..\output\MultiHawk.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - - - ..\output64\ - TRACE;WINDOWS - true - true - pdbonly - x64 - ..\output\MultiHawk.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - - - - Debug - x86 - {B95649F5-A0AE-41EB-B62B-578A2AFF5E18} - WinExe - Properties - BizHawk.Client.MultiHawk - MultiHawk - v4.6.1 - 512 - - - - x86 - true - full - false - ..\output\ - TRACE;DEBUG;WINDOWS - prompt - 4 - true - false - - - x86 - pdbonly - true - ..\output\ - TRACE;WINDOWS - prompt - 4 - true - false - - - - - False - ..\References\Newtonsoft.Json.dll - - - ..\References\OpenTK.dll - - - False - ..\References\$(Platform)\SlimDX.dll - - - - - - - - - - - - - - - Form - - - PlayMovie.cs - - - Form - - - RecordMovie.cs - - - - Form - - - EmulatorWindow.cs - - - - - - - - Form - - - Mainform.cs - - - - - - - - PlayMovie.cs - - - RecordMovie.cs - - - EmulatorWindow.cs - - - Mainform.cs - - - ResXFileCodeGenerator + + + + true + ..\output64\ + TRACE;DEBUG;WINDOWS + true + full + x64 + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + ..\output64\ + TRACE;WINDOWS + true + true + pdbonly + x64 + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + true + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + true + false + + + + Debug + x86 + {B95649F5-A0AE-41EB-B62B-578A2AFF5E18} + WinExe + Properties + BizHawk.Client.MultiHawk + MultiHawk + v4.6.1 + 512 + + + + + + False + ..\References\Newtonsoft.Json.dll + + + ..\References\OpenTK.dll + + + False + ..\References\$(Platform)\SlimDX.dll + + + + + + + + + + + + + + + Form + + + PlayMovie.cs + + + Form + + + RecordMovie.cs + + + + Form + + + EmulatorWindow.cs + + + + + + + + Form + + + Mainform.cs + + + + + + + + PlayMovie.cs + + + RecordMovie.cs + + + EmulatorWindow.cs + + + Mainform.cs + + + ResXFileCodeGenerator Resources.Designer.cs - Designer - + Designer + True Resources.resx True - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - {24a0aa3c-b25f-4197-b23d-476d6462dba0} - BizHawk.Client.Common - - - {dd448b37-ba3f-4544-9754-5406e8094723} - BizHawk.Client.EmuHawk - - - {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} - BizHawk.Common - - - {e1a23168-b571-411c-b360-2229e7225e0e} - BizHawk.Emulation.Common - - - {197d4314-8a9f-49ba-977d-54acefaeb6ba} - BizHawk.Emulation.Cores - - - {f51946ea-827f-4d82-b841-1f2f6d060312} - BizHawk.Emulation.DiscSystem - - - {337ca23e-65e7-44e1-9411-97ee08bb8116} - BizHawk.Bizware.BizwareGL.GdiPlus - - - {5160cfb1-5389-47c1-b7f6-8a0dc97641ee} - BizHawk.Bizware.BizwareGL.OpenTK - - - {e6b436b1-a3cd-4c9a-8f76-5d7154726884} - BizHawk.Bizware.BizwareGL.SlimDX - - - {9f84a0b2-861e-4ef4-b89b-5e2a3f38a465} - BizHawk.Bizware.BizwareGL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + + + {24a0aa3c-b25f-4197-b23d-476d6462dba0} + BizHawk.Client.Common + + + {dd448b37-ba3f-4544-9754-5406e8094723} + BizHawk.Client.EmuHawk + + + {866f8d13-0678-4ff9-80a4-a3993fd4d8a3} + BizHawk.Common + + + {e1a23168-b571-411c-b360-2229e7225e0e} + BizHawk.Emulation.Common + + + {197d4314-8a9f-49ba-977d-54acefaeb6ba} + BizHawk.Emulation.Cores + + + {f51946ea-827f-4d82-b841-1f2f6d060312} + BizHawk.Emulation.DiscSystem + + + {337ca23e-65e7-44e1-9411-97ee08bb8116} + BizHawk.Bizware.BizwareGL.GdiPlus + + + {5160cfb1-5389-47c1-b7f6-8a0dc97641ee} + BizHawk.Bizware.BizwareGL.OpenTK + + + {e6b436b1-a3cd-4c9a-8f76-5d7154726884} + BizHawk.Bizware.BizwareGL.SlimDX + + + {9f84a0b2-861e-4ef4-b89b-5e2a3f38a465} + BizHawk.Bizware.BizwareGL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> \ No newline at end of file diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj index bf3d1ed096..f497ff7ed1 100644 --- a/BizHawk.Common/BizHawk.Common.csproj +++ b/BizHawk.Common/BizHawk.Common.csproj @@ -14,29 +14,6 @@ 512 - - true - full - false - ..\output\dll\ - TRACE;DEBUG;WINDOWS - prompt - 4 - x86 - true - false - - - pdbonly - true - ..\output\dll\ - TRACE;WINDOWS - prompt - 4 - x86 - true - false - true ..\output64\dll\ @@ -44,7 +21,6 @@ true full x64 - ..\output\dll\BizHawk.Common.dll.CodeAnalysisLog.xml true GlobalSuppressions.cs prompt @@ -63,7 +39,6 @@ true pdbonly x64 - ..\output\dll\BizHawk.Common.dll.CodeAnalysisLog.xml true GlobalSuppressions.cs prompt diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj index a6b6fbed97..b58e921004 100644 --- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj +++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj @@ -51,29 +51,6 @@ 512 - - true - full - false - ..\output\dll\ - DEBUG;TRACE - prompt - 4 - true - x86 - false - - - pdbonly - true - ..\output\dll\ - TRACE - prompt - 4 - true - x86 - false - False diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj index e95661f388..4991f2726d 100644 --- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj +++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj @@ -33,33 +33,6 @@ true - - true - full - false - ..\output\dll\ - DEBUG;TRACE - prompt - 4 - x86 - true - false - AllRules.ruleset - false - - - pdbonly - true - ..\output\dll\ - TRACE;VS2010 - prompt - 4 - x86 - true - AllRules.ruleset - false - false - true ..\output64\dll\ @@ -67,7 +40,6 @@ true full x64 - ..\output\dll\BizHawk.Emulation.Cores.dll.CodeAnalysisLog.xml true GlobalSuppressions.cs false diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj index 2ba72eb17f..3e320bb2e1 100644 --- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj +++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj @@ -51,29 +51,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - x86 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - x86 - false - diff --git a/BizHawk.sln b/BizHawk.sln index 02b4a3037b..702ae16045 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -63,149 +63,87 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|x64.ActiveCfg = Debug|x64 {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|x64.Build.0 = Debug|x64 - {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|x86.ActiveCfg = Debug|x86 - {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Debug|x86.Build.0 = Debug|x86 {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|x64.ActiveCfg = Release|x64 {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|x64.Build.0 = Release|x64 - {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|x86.ActiveCfg = Release|x86 - {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}.Release|x86.Build.0 = Release|x86 {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|x64.ActiveCfg = Debug|x64 {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|x64.Build.0 = Debug|x64 - {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|x86.ActiveCfg = Debug|x86 - {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|x86.Build.0 = Debug|x86 {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|x64.ActiveCfg = Release|x64 {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|x64.Build.0 = Release|x64 - {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|x86.ActiveCfg = Release|x86 - {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|x86.Build.0 = Release|x86 {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|x64.ActiveCfg = Debug|x64 {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|x64.Build.0 = Debug|x64 - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|x86.ActiveCfg = Debug|x86 - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|x86.Build.0 = Debug|x86 {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|x64.ActiveCfg = Release|x64 {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|x64.Build.0 = Release|x64 - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|x86.ActiveCfg = Release|x86 - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|x86.Build.0 = Release|x86 {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|x64.ActiveCfg = Debug|x64 {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|x64.Build.0 = Debug|x64 - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|x86.ActiveCfg = Debug|x86 - {DD448B37-BA3F-4544-9754-5406E8094723}.Debug|x86.Build.0 = Debug|x86 {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x64.ActiveCfg = Release|x64 {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x64.Build.0 = Release|x64 - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x86.ActiveCfg = Release|x86 - {DD448B37-BA3F-4544-9754-5406E8094723}.Release|x86.Build.0 = Release|x86 {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|x64.ActiveCfg = Debug|x64 {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|x64.Build.0 = Debug|x64 - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|x86.ActiveCfg = Debug|x86 - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Debug|x86.Build.0 = Debug|x86 {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x64.ActiveCfg = Release|x64 {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x64.Build.0 = Release|x64 - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x86.ActiveCfg = Release|x86 - {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|x86.Build.0 = Release|x86 {F51946EA-827F-4D82-B841-1F2F6D060312}.Debug|x64.ActiveCfg = Debug|x64 {F51946EA-827F-4D82-B841-1F2F6D060312}.Debug|x64.Build.0 = Debug|x64 - {F51946EA-827F-4D82-B841-1F2F6D060312}.Debug|x86.ActiveCfg = Debug|x86 - {F51946EA-827F-4D82-B841-1F2F6D060312}.Debug|x86.Build.0 = Debug|x86 {F51946EA-827F-4D82-B841-1F2F6D060312}.Release|x64.ActiveCfg = Release|x64 {F51946EA-827F-4D82-B841-1F2F6D060312}.Release|x64.Build.0 = Release|x64 - {F51946EA-827F-4D82-B841-1F2F6D060312}.Release|x86.ActiveCfg = Release|x86 - {F51946EA-827F-4D82-B841-1F2F6D060312}.Release|x86.Build.0 = Release|x86 {E1A23168-B571-411C-B360-2229E7225E0E}.Debug|x64.ActiveCfg = Debug|x64 {E1A23168-B571-411C-B360-2229E7225E0E}.Debug|x64.Build.0 = Debug|x64 - {E1A23168-B571-411C-B360-2229E7225E0E}.Debug|x86.ActiveCfg = Debug|x86 - {E1A23168-B571-411C-B360-2229E7225E0E}.Debug|x86.Build.0 = Debug|x86 {E1A23168-B571-411C-B360-2229E7225E0E}.Release|x64.ActiveCfg = Release|x64 {E1A23168-B571-411C-B360-2229E7225E0E}.Release|x64.Build.0 = Release|x64 - {E1A23168-B571-411C-B360-2229E7225E0E}.Release|x86.ActiveCfg = Release|x86 - {E1A23168-B571-411C-B360-2229E7225E0E}.Release|x86.Build.0 = Release|x86 {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|x64.ActiveCfg = Debug|x64 {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|x64.Build.0 = Debug|x64 - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|x86.ActiveCfg = Debug|x86 - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|x86.Build.0 = Debug|x86 {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x64.ActiveCfg = Release|x64 {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x64.Build.0 = Release|x64 - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|x86 - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.Build.0 = Release|x86 {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Debug|x64.ActiveCfg = Debug|x64 {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Debug|x64.Build.0 = Debug|x64 - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Debug|x86.ActiveCfg = Debug|x86 - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Debug|x86.Build.0 = Debug|x86 {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|x64.ActiveCfg = Release|x64 {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|x64.Build.0 = Release|x64 - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|x86.ActiveCfg = Release|x86 - {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}.Release|x86.Build.0 = Release|x86 {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Debug|x64.ActiveCfg = Debug|x64 {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Debug|x64.Build.0 = Debug|x64 - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Debug|x86.ActiveCfg = Debug|x86 - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Debug|x86.Build.0 = Debug|x86 {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Release|x64.ActiveCfg = Release|x64 {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Release|x64.Build.0 = Release|x64 - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Release|x86.ActiveCfg = Release|x86 - {5160CFB1-5389-47C1-B7F6-8A0DC97641EE}.Release|x86.Build.0 = Release|x86 {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Debug|x64.ActiveCfg = Debug|x64 {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Debug|x64.Build.0 = Debug|x64 - {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Debug|x86.ActiveCfg = Debug|x86 - {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Debug|x86.Build.0 = Debug|x86 {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Release|x64.ActiveCfg = Release|x64 {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Release|x64.Build.0 = Release|x64 - {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Release|x86.ActiveCfg = Release|x86 - {2D2890A8-C338-4439-AD8B-CB9EE85A94F9}.Release|x86.Build.0 = Release|x86 {337CA23E-65E7-44E1-9411-97EE08BB8116}.Debug|x64.ActiveCfg = Debug|x64 {337CA23E-65E7-44E1-9411-97EE08BB8116}.Debug|x64.Build.0 = Debug|x64 - {337CA23E-65E7-44E1-9411-97EE08BB8116}.Debug|x86.ActiveCfg = Debug|x86 - {337CA23E-65E7-44E1-9411-97EE08BB8116}.Debug|x86.Build.0 = Debug|x86 {337CA23E-65E7-44E1-9411-97EE08BB8116}.Release|x64.ActiveCfg = Release|x64 {337CA23E-65E7-44E1-9411-97EE08BB8116}.Release|x64.Build.0 = Release|x64 - {337CA23E-65E7-44E1-9411-97EE08BB8116}.Release|x86.ActiveCfg = Release|x86 - {337CA23E-65E7-44E1-9411-97EE08BB8116}.Release|x86.Build.0 = Release|x86 {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Debug|x64.ActiveCfg = Debug|x64 {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Debug|x64.Build.0 = Debug|x64 - {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Debug|x86.ActiveCfg = Debug|x86 - {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Debug|x86.Build.0 = Debug|x86 {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|x64.ActiveCfg = Release|x64 {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|x64.Build.0 = Release|x64 - {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|x86.ActiveCfg = Release|x86 - {E6B436B1-A3CD-4C9A-8F76-5D7154726884}.Release|x86.Build.0 = Release|x86 {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Debug|x64.ActiveCfg = Debug|x64 {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Debug|x64.Build.0 = Debug|x64 - {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Debug|x86.ActiveCfg = Debug|x86 - {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Debug|x86.Build.0 = Debug|x86 {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Release|x64.ActiveCfg = Release|x64 {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Release|x64.Build.0 = Release|x64 - {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Release|x86.ActiveCfg = Release|x86 - {B95649F5-A0AE-41EB-B62B-578A2AFF5E18}.Release|x86.Build.0 = Release|x86 {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|x64.ActiveCfg = Debug|x64 {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|x64.Build.0 = Debug|x64 - {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|x86.ActiveCfg = Debug|x86 - {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|x86.Build.0 = Debug|x86 {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|x64.ActiveCfg = Release|x64 {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|x64.Build.0 = Release|x64 - {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|x86.ActiveCfg = Release|x86 - {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} {DD448B37-BA3F-4544-9754-5406E8094723} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} {C4366030-6D03-424B-AE53-F4F43BB217C3} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} - {24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} - {2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} - {B95649F5-A0AE-41EB-B62B-578A2AFF5E18} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} - {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} - {E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC} {F51946EA-827F-4D82-B841-1F2F6D060312} = {3627C08B-3E43-4224-9DA4-40BD69495FBC} + {E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC} {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC} {9F84A0B2-861E-4EF4-B89B-5E2A3F38A465} = {0540A9A6-977E-466D-8BD3-1D8590BD5282} {5160CFB1-5389-47C1-B7F6-8A0DC97641EE} = {0540A9A6-977E-466D-8BD3-1D8590BD5282} + {2D2890A8-C338-4439-AD8B-CB9EE85A94F9} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} {337CA23E-65E7-44E1-9411-97EE08BB8116} = {0540A9A6-977E-466D-8BD3-1D8590BD5282} {E6B436B1-A3CD-4C9A-8F76-5D7154726884} = {0540A9A6-977E-466D-8BD3-1D8590BD5282} + {B95649F5-A0AE-41EB-B62B-578A2AFF5E18} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} + {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = BizHawk.Client.EmuHawk\BizHawk.Client.EmuHawk.csproj diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj index 91ef743c39..e0828eeee4 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj @@ -14,29 +14,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - x86 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - x86 - false - true bin\x64\Debug\ diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj index 5af4ec6a26..ecf94aff01 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj @@ -14,29 +14,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - x86 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - x86 - false - true bin\x64\Debug\ diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj index 8614618886..2356fc4932 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj @@ -14,29 +14,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - x86 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - x86 - false - true bin\x64\Debug\ diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj index 351a4e6a34..3b52371bff 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj @@ -14,29 +14,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - x86 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - x86 - false - true bin\x64\Debug\ diff --git a/Version/version.csproj b/Version/version.csproj index 70112f52da..ad7e23f837 100644 --- a/Version/version.csproj +++ b/Version/version.csproj @@ -16,27 +16,6 @@ 512 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x86 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x86 - false - true bin\x64\Debug\