diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj index a33c2a208d..70c819165d 100644 --- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj +++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj @@ -84,6 +84,9 @@ + + ..\References\Virtu.dll + @@ -120,7 +123,7 @@ AppleII.cs - AppleII.cs + AppleII.cs AppleII.cs @@ -128,39 +131,6 @@ AppleII.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C64.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Cassette.cs b/ExternalCoreProjects/Virtu/Cassette.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Cassette.cs rename to ExternalCoreProjects/Virtu/Cassette.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Cpu.cs b/ExternalCoreProjects/Virtu/Cpu.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Cpu.cs rename to ExternalCoreProjects/Virtu/Cpu.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/CpuData.cs b/ExternalCoreProjects/Virtu/CpuData.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/CpuData.cs rename to ExternalCoreProjects/Virtu/CpuData.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Disk525.cs b/ExternalCoreProjects/Virtu/Disk525.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Disk525.cs rename to ExternalCoreProjects/Virtu/Disk525.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskDsk.cs b/ExternalCoreProjects/Virtu/DiskDsk.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskDsk.cs rename to ExternalCoreProjects/Virtu/DiskDsk.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIController.cs b/ExternalCoreProjects/Virtu/DiskIIController.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIController.cs rename to ExternalCoreProjects/Virtu/DiskIIController.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIDrive.cs b/ExternalCoreProjects/Virtu/DiskIIDrive.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIDrive.cs rename to ExternalCoreProjects/Virtu/DiskIIDrive.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskNib.cs b/ExternalCoreProjects/Virtu/DiskNib.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskNib.cs rename to ExternalCoreProjects/Virtu/DiskNib.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/GamePort.cs b/ExternalCoreProjects/Virtu/GamePort.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/GamePort.cs rename to ExternalCoreProjects/Virtu/GamePort.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Keyboard.cs b/ExternalCoreProjects/Virtu/Keyboard.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Keyboard.cs rename to ExternalCoreProjects/Virtu/Keyboard.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/DisposableBase.cs b/ExternalCoreProjects/Virtu/Library/DisposableBase.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/DisposableBase.cs rename to ExternalCoreProjects/Virtu/Library/DisposableBase.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/MathHelpers.cs b/ExternalCoreProjects/Virtu/Library/MathHelpers.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/MathHelpers.cs rename to ExternalCoreProjects/Virtu/Library/MathHelpers.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/StreamExtensions.cs b/ExternalCoreProjects/Virtu/Library/StreamExtensions.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/StreamExtensions.cs rename to ExternalCoreProjects/Virtu/Library/StreamExtensions.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/Strings.cs b/ExternalCoreProjects/Virtu/Library/Strings.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Library/Strings.cs rename to ExternalCoreProjects/Virtu/Library/Strings.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs b/ExternalCoreProjects/Virtu/Machine.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs rename to ExternalCoreProjects/Virtu/Machine.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/MachineComponent.cs b/ExternalCoreProjects/Virtu/MachineComponent.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/MachineComponent.cs rename to ExternalCoreProjects/Virtu/MachineComponent.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/MachineEvents.cs b/ExternalCoreProjects/Virtu/MachineEvents.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/MachineEvents.cs rename to ExternalCoreProjects/Virtu/MachineEvents.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Memory.cs b/ExternalCoreProjects/Virtu/Memory.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Memory.cs rename to ExternalCoreProjects/Virtu/Memory.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/MemoryData.cs b/ExternalCoreProjects/Virtu/MemoryData.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/MemoryData.cs rename to ExternalCoreProjects/Virtu/MemoryData.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/NoSlotClock.cs b/ExternalCoreProjects/Virtu/NoSlotClock.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/NoSlotClock.cs rename to ExternalCoreProjects/Virtu/NoSlotClock.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/PeripheralCard.cs b/ExternalCoreProjects/Virtu/PeripheralCard.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/PeripheralCard.cs rename to ExternalCoreProjects/Virtu/PeripheralCard.cs diff --git a/ExternalCoreProjects/Virtu/Properties/AssemblyInfo.cs b/ExternalCoreProjects/Virtu/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..8354598541 --- /dev/null +++ b/ExternalCoreProjects/Virtu/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("Virtu")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("BizHawk.Virtu")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[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("87480450-7b5e-46a8-8c39-ace4cb156f3b")] + +// 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.Emulation.Cores/Computers/AppleII/Virtu/Services/AudioService.cs b/ExternalCoreProjects/Virtu/Services/AudioService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/AudioService.cs rename to ExternalCoreProjects/Virtu/Services/AudioService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/DebugService.cs b/ExternalCoreProjects/Virtu/Services/DebugService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/DebugService.cs rename to ExternalCoreProjects/Virtu/Services/DebugService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/GamePortService.cs b/ExternalCoreProjects/Virtu/Services/GamePortService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/GamePortService.cs rename to ExternalCoreProjects/Virtu/Services/GamePortService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/IsolatedStorageService.cs b/ExternalCoreProjects/Virtu/Services/IsolatedStorageService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/IsolatedStorageService.cs rename to ExternalCoreProjects/Virtu/Services/IsolatedStorageService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/KeyboardService.cs b/ExternalCoreProjects/Virtu/Services/KeyboardService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/KeyboardService.cs rename to ExternalCoreProjects/Virtu/Services/KeyboardService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/MachineService.cs b/ExternalCoreProjects/Virtu/Services/MachineService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/MachineService.cs rename to ExternalCoreProjects/Virtu/Services/MachineService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/MachineServices.cs b/ExternalCoreProjects/Virtu/Services/MachineServices.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/MachineServices.cs rename to ExternalCoreProjects/Virtu/Services/MachineServices.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/StorageService.cs b/ExternalCoreProjects/Virtu/Services/StorageService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/StorageService.cs rename to ExternalCoreProjects/Virtu/Services/StorageService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/VideoService.cs b/ExternalCoreProjects/Virtu/Services/VideoService.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Services/VideoService.cs rename to ExternalCoreProjects/Virtu/Services/VideoService.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Speaker.cs b/ExternalCoreProjects/Virtu/Speaker.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Speaker.cs rename to ExternalCoreProjects/Virtu/Speaker.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Video.cs b/ExternalCoreProjects/Virtu/Video.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Video.cs rename to ExternalCoreProjects/Virtu/Video.cs diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/VideoData.cs b/ExternalCoreProjects/Virtu/VideoData.cs similarity index 100% rename from BizHawk.Emulation.Cores/Computers/AppleII/Virtu/VideoData.cs rename to ExternalCoreProjects/Virtu/VideoData.cs diff --git a/ExternalCoreProjects/Virtu/Virtu.csproj b/ExternalCoreProjects/Virtu/Virtu.csproj new file mode 100644 index 0000000000..7c845ddfa0 --- /dev/null +++ b/ExternalCoreProjects/Virtu/Virtu.csproj @@ -0,0 +1,89 @@ + + + + + Debug + AnyCPU + {8E522778-7A2C-4364-BDCE-0BA5623828E1} + Library + Properties + Virtu + Virtu + v4.0 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy /y $(TargetDir)$(TargetFileName) $(ProjectDir)..\..\references\$(TargetFileName) + + + \ No newline at end of file diff --git a/ExternalCoreProjects/Virtu/Virtu.sln b/ExternalCoreProjects/Virtu/Virtu.sln new file mode 100644 index 0000000000..bb91199c5c --- /dev/null +++ b/ExternalCoreProjects/Virtu/Virtu.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Virtu", "Virtu.csproj", "{8E522778-7A2C-4364-BDCE-0BA5623828E1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E522778-7A2C-4364-BDCE-0BA5623828E1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E522778-7A2C-4364-BDCE-0BA5623828E1}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/References/Virtu.dll b/References/Virtu.dll new file mode 100644 index 0000000000..accbb4d4f0 Binary files /dev/null and b/References/Virtu.dll differ