diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj new file mode 100644 index 0000000000..e0f74a6bca --- /dev/null +++ b/BizHawk.Common/BizHawk.Common.csproj @@ -0,0 +1,55 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} + Library + Properties + BizHawk.Common + BizHawk.Common + v4.0 + 512 + + + true + full + false + bin\Release\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BizHawk.MultiClient/MruStack.cs b/BizHawk.Common/MruStack.cs similarity index 89% rename from BizHawk.MultiClient/MruStack.cs rename to BizHawk.Common/MruStack.cs index 9b7713998f..72f915dea0 100644 --- a/BizHawk.MultiClient/MruStack.cs +++ b/BizHawk.Common/MruStack.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient +namespace BizHawk.Common { public class MruStack { diff --git a/BizHawk.Common/Properties/AssemblyInfo.cs b/BizHawk.Common/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..706c13aeb7 --- /dev/null +++ b/BizHawk.Common/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("BizHawk.Common")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Measurement Incorporated")] +[assembly: AssemblyProduct("BizHawk.Common")] +[assembly: AssemblyCopyright("Copyright © Measurement Incorporated 2013")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f8e9ad29-89d8-478b-a699-ed3369703b6a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/BizHawk.MultiClient/tools/Watch/UndoHistory.cs b/BizHawk.Common/UndoHistory.cs similarity index 91% rename from BizHawk.MultiClient/tools/Watch/UndoHistory.cs rename to BizHawk.Common/UndoHistory.cs index 23b41a8b64..b96552c03f 100644 --- a/BizHawk.MultiClient/tools/Watch/UndoHistory.cs +++ b/BizHawk.Common/UndoHistory.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace BizHawk.Client.Common +namespace BizHawk.Common { public class UndoHistory { diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj index aa88aed485..7d5ded55be 100644 --- a/BizHawk.Emulation/BizHawk.Emulation.csproj +++ b/BizHawk.Emulation/BizHawk.Emulation.csproj @@ -583,7 +583,12 @@ - + + + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} + BizHawk.Common + + diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index a07f8e57a8..7b6774431f 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -344,7 +344,6 @@ SubtitleMaker.cs - Form @@ -734,7 +733,6 @@ RamWatch.cs - Form @@ -1009,6 +1007,10 @@ {24A0AA3C-B25F-4197-B23D-476D6462DBA0} BizHawk.Client.Common + + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} + BizHawk.Common + {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} BizHawk.Emulation diff --git a/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs b/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs index 2a7deec794..436a7e9c7a 100644 --- a/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs +++ b/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using BizHawk.Common; using BizHawk.Client.Common; namespace BizHawk.MultiClient diff --git a/BizHawk.sln b/BizHawk.sln index 0355e2d56d..1f1fe47c80 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.PCE_Debugger", "Biz 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}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -89,6 +91,18 @@ Global {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|Mixed Platforms.Build.0 = Release|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|Win32.ActiveCfg = Release|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|x86.ActiveCfg = Release|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Win32.ActiveCfg = Debug|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|x86.ActiveCfg = Debug|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Any CPU.Build.0 = Release|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Win32.ActiveCfg = Release|Any CPU + {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE