From c7801b8ce274824ab32445561f556e07a3d96d39 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 23 Jan 2020 08:55:29 +1000 Subject: [PATCH] Move BizHawk.Common.BizInvoke namespace to separate project --- .../BizExvoker.cs | 4 +- BizHawk.BizInvoke/BizHawk.BizInvoke.csproj | 12 + .../BizInvokeUtilities.cs | 2 +- .../BizInvoker.cs | 4 +- .../CallingConventionAdapter.cs | 2 +- .../MemoryBlock.cs | 2 +- .../MemoryBlockBase.cs | 4 +- .../MemoryBlockUnix.cs | 4 +- .../POSIXLibC.cs | 4 +- .../WaterboxUtils.cs | 2 +- .../BizHawk.Emulation.Cores.csproj | 303 +----------------- .../Consoles/Belogic/LibUzem.cs | 2 +- .../Consoles/NEC/PCFX/LibTst.cs | 2 +- .../Consoles/Nintendo/Gameboy/LibSameboy.cs | 2 +- .../Consoles/Nintendo/QuickNES/LibQuickNES.cs | 2 +- .../Consoles/Nintendo/QuickNES/QuickNES.cs | 2 +- .../Consoles/Nintendo/SNES/LibsnesApi.cs | 2 +- .../Consoles/Nintendo/SNES9X/LibSnes9x.cs | 2 +- .../Consoles/Nintendo/VB/LibVirtualBoyee.cs | 2 +- .../Consoles/Nintendo/VB/VirtualBoyee.cs | 2 +- .../Consoles/SNK/DualNeoGeoPort.cs | 2 +- .../Consoles/SNK/LibNeoGeoPort.cs | 2 +- .../Consoles/Sega/PicoDrive/LibPicoDrive.cs | 2 +- .../Consoles/Sega/Saturn/LibSaturnus.cs | 2 +- .../Consoles/Sega/Saturn/Saturnus.cs | 2 +- .../Consoles/Sega/gpgx64/GPGX.cs | 2 +- .../Consoles/Sega/gpgx64/LibGPGX.cs | 2 +- BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs | 2 +- BizHawk.Emulation.Cores/Waterbox/Heap.cs | 2 +- .../Waterbox/LibWaterboxCore.cs | 2 +- BizHawk.Emulation.Cores/Waterbox/MapHeap.cs | 2 +- BizHawk.Emulation.Cores/Waterbox/PeRunner.cs | 2 +- BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs | 2 +- BizHawk.Emulation.Cores/Waterbox/Swappable.cs | 2 +- .../Waterbox/WaterboxCore.cs | 2 +- BizHawk.sln | 6 + 36 files changed, 59 insertions(+), 338 deletions(-) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/BizExvoker.cs (95%) create mode 100644 BizHawk.BizInvoke/BizHawk.BizInvoke.csproj rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/BizInvokeUtilities.cs (98%) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/BizInvoker.cs (95%) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/CallingConventionAdapter.cs (97%) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/MemoryBlock.cs (96%) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/MemoryBlockBase.cs (99%) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/MemoryBlockUnix.cs (98%) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/POSIXLibC.cs (94%) rename {BizHawk.Common/BizInvoke => BizHawk.BizInvoke}/WaterboxUtils.cs (93%) diff --git a/BizHawk.Common/BizInvoke/BizExvoker.cs b/BizHawk.BizInvoke/BizExvoker.cs similarity index 95% rename from BizHawk.Common/BizInvoke/BizExvoker.cs rename to BizHawk.BizInvoke/BizExvoker.cs index 5956a08bf5..ed9af81894 100644 --- a/BizHawk.Common/BizInvoke/BizExvoker.cs +++ b/BizHawk.BizInvoke/BizExvoker.cs @@ -6,7 +6,9 @@ using System.Reflection.Emit; using System.Runtime.InteropServices; using System.Text; -namespace BizHawk.Common.BizInvoke +using BizHawk.Common; + +namespace BizHawk.BizInvoke { public static class BizExvoker { diff --git a/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj b/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj new file mode 100644 index 0000000000..ee5b96d0a9 --- /dev/null +++ b/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj @@ -0,0 +1,12 @@ + + + + true + ../output/dll + net48 + + + + + + diff --git a/BizHawk.Common/BizInvoke/BizInvokeUtilities.cs b/BizHawk.BizInvoke/BizInvokeUtilities.cs similarity index 98% rename from BizHawk.Common/BizInvoke/BizInvokeUtilities.cs rename to BizHawk.BizInvoke/BizInvokeUtilities.cs index 7272d87606..45a32b7bf0 100644 --- a/BizHawk.Common/BizInvoke/BizInvokeUtilities.cs +++ b/BizHawk.BizInvoke/BizInvokeUtilities.cs @@ -4,7 +4,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Runtime.InteropServices; -namespace BizHawk.Common.BizInvoke +namespace BizHawk.BizInvoke { public static class BizInvokeUtilities { diff --git a/BizHawk.Common/BizInvoke/BizInvoker.cs b/BizHawk.BizInvoke/BizInvoker.cs similarity index 95% rename from BizHawk.Common/BizInvoke/BizInvoker.cs rename to BizHawk.BizInvoke/BizInvoker.cs index 2e31cd7b4f..e79d8d2797 100644 --- a/BizHawk.Common/BizInvoke/BizInvoker.cs +++ b/BizHawk.BizInvoke/BizInvoker.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; using BizHawk.Common; -namespace BizHawk.Common.BizInvoke +namespace BizHawk.BizInvoke { public static class BizInvoker { @@ -60,7 +60,7 @@ namespace BizHawk.Common.BizInvoke /// get an implementation proxy for an interop class /// /// The class type that represents the DLL - /// previously called with + /// overload previously called with public static T GetInvoker(IImportResolver dll, ICallingConventionAdapter adapter) where T : class { diff --git a/BizHawk.Common/BizInvoke/CallingConventionAdapter.cs b/BizHawk.BizInvoke/CallingConventionAdapter.cs similarity index 97% rename from BizHawk.Common/BizInvoke/CallingConventionAdapter.cs rename to BizHawk.BizInvoke/CallingConventionAdapter.cs index dcec1a966b..83dbe3a527 100644 --- a/BizHawk.Common/BizInvoke/CallingConventionAdapter.cs +++ b/BizHawk.BizInvoke/CallingConventionAdapter.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; -namespace BizHawk.Common.BizInvoke +namespace BizHawk.BizInvoke { /// /// create interop delegates and function pointers for a particular calling convention diff --git a/BizHawk.Common/BizInvoke/MemoryBlock.cs b/BizHawk.BizInvoke/MemoryBlock.cs similarity index 96% rename from BizHawk.Common/BizInvoke/MemoryBlock.cs rename to BizHawk.BizInvoke/MemoryBlock.cs index 3a17938d51..9f4008d41c 100644 --- a/BizHawk.Common/BizInvoke/MemoryBlock.cs +++ b/BizHawk.BizInvoke/MemoryBlock.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.IO; -namespace BizHawk.Common.BizInvoke +namespace BizHawk.BizInvoke { public sealed class MemoryBlock : MemoryBlockBase { diff --git a/BizHawk.Common/BizInvoke/MemoryBlockBase.cs b/BizHawk.BizInvoke/MemoryBlockBase.cs similarity index 99% rename from BizHawk.Common/BizInvoke/MemoryBlockBase.cs rename to BizHawk.BizInvoke/MemoryBlockBase.cs index bfcee0127b..dd16e3739e 100644 --- a/BizHawk.Common/BizInvoke/MemoryBlockBase.cs +++ b/BizHawk.BizInvoke/MemoryBlockBase.cs @@ -2,7 +2,9 @@ using System; using System.IO; using System.Runtime.InteropServices; -namespace BizHawk.Common.BizInvoke +using BizHawk.Common; + +namespace BizHawk.BizInvoke { public abstract class MemoryBlockBase : IDisposable { diff --git a/BizHawk.Common/BizInvoke/MemoryBlockUnix.cs b/BizHawk.BizInvoke/MemoryBlockUnix.cs similarity index 98% rename from BizHawk.Common/BizInvoke/MemoryBlockUnix.cs rename to BizHawk.BizInvoke/MemoryBlockUnix.cs index 7dc5bb4deb..059a8b0ace 100644 --- a/BizHawk.Common/BizInvoke/MemoryBlockUnix.cs +++ b/BizHawk.BizInvoke/MemoryBlockUnix.cs @@ -1,9 +1,9 @@ using System; using System.IO; -using static BizHawk.Common.POSIXLibC; +using static BizHawk.BizInvoke.POSIXLibC; -namespace BizHawk.Common.BizInvoke +namespace BizHawk.BizInvoke { public sealed class MemoryBlockUnix : MemoryBlockBase { diff --git a/BizHawk.Common/BizInvoke/POSIXLibC.cs b/BizHawk.BizInvoke/POSIXLibC.cs similarity index 94% rename from BizHawk.Common/BizInvoke/POSIXLibC.cs rename to BizHawk.BizInvoke/POSIXLibC.cs index 877b256e73..6d61c32b8f 100644 --- a/BizHawk.Common/BizInvoke/POSIXLibC.cs +++ b/BizHawk.BizInvoke/POSIXLibC.cs @@ -1,9 +1,9 @@ using System; using System.Runtime.InteropServices; -using static BizHawk.Common.BizInvoke.MemoryBlockBase; +using static BizHawk.BizInvoke.MemoryBlockBase; -namespace BizHawk.Common +namespace BizHawk.BizInvoke { public static class POSIXLibC { diff --git a/BizHawk.Common/BizInvoke/WaterboxUtils.cs b/BizHawk.BizInvoke/WaterboxUtils.cs similarity index 93% rename from BizHawk.Common/BizInvoke/WaterboxUtils.cs rename to BizHawk.BizInvoke/WaterboxUtils.cs index 07cbd4d364..132edf2957 100644 --- a/BizHawk.Common/BizInvoke/WaterboxUtils.cs +++ b/BizHawk.BizInvoke/WaterboxUtils.cs @@ -2,7 +2,7 @@ using System.IO; using System.Security.Cryptography; -namespace BizHawk.Common.BizInvoke +namespace BizHawk.BizInvoke { public static class WaterboxUtils { diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj index cae443c89f..f31cb828a6 100644 --- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj +++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj @@ -59,6 +59,7 @@ Private="true" /> + @@ -66,311 +67,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BizHawk.Emulation.Cores/Consoles/Belogic/LibUzem.cs b/BizHawk.Emulation.Cores/Consoles/Belogic/LibUzem.cs index 8a1c6d4452..661c116be0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Belogic/LibUzem.cs +++ b/BizHawk.Emulation.Cores/Consoles/Belogic/LibUzem.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Waterbox; using System; using System.Collections.Generic; diff --git a/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/LibTst.cs b/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/LibTst.cs index abb706c4d9..829980880f 100644 --- a/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/LibTst.cs +++ b/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/LibTst.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Consoles.Sega.Saturn; using BizHawk.Emulation.Cores.Waterbox; using System; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibSameboy.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibSameboy.cs index 38497fc352..40b5ba4adf 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibSameboy.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibSameboy.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Waterbox; using System; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs index dc3be9c3d5..c4e4deede0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 3241355b9b..e4f746875e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using BizHawk.Common; using BizHawk.Emulation.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs index 1954c8fdcb..de1302a74b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using BizHawk.Common; using BizHawk.Emulation.Cores.Waterbox; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Nintendo.SNES diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/LibSnes9x.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/LibSnes9x.cs index c82e32b466..444b9733e5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/LibSnes9x.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/LibSnes9x.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Runtime.InteropServices; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Waterbox; namespace BizHawk.Emulation.Cores.Nintendo.SNES9X diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs index 619f304736..9adb61d940 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Waterbox; using System; using System.Collections.Generic; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs index 2b564a11e3..688f15cdcd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Common.BufferExtensions; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Waterbox; diff --git a/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs b/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs index 87774a5428..814369efc8 100644 --- a/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs +++ b/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Sound; using BizHawk.Emulation.Cores.Waterbox; diff --git a/BizHawk.Emulation.Cores/Consoles/SNK/LibNeoGeoPort.cs b/BizHawk.Emulation.Cores/Consoles/SNK/LibNeoGeoPort.cs index 5a047b3891..307d7357c7 100644 --- a/BizHawk.Emulation.Cores/Consoles/SNK/LibNeoGeoPort.cs +++ b/BizHawk.Emulation.Cores/Consoles/SNK/LibNeoGeoPort.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Waterbox; using System; using System.Collections.Generic; diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs index f63cc1466d..0df8bae96d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Waterbox; using System; using System.Runtime.InteropServices; diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/LibSaturnus.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/LibSaturnus.cs index c8a788a499..7c5aba98e9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/LibSaturnus.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/LibSaturnus.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Cores.Waterbox; using System; using System.Collections.Generic; diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs index 5320c39603..e379ec8b11 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Common.BufferExtensions; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Waterbox; diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs index 50c6757ed6..9d2e66aa08 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Waterbox; using BizHawk.Common; diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs index 5892f53513..c9221ce262 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx { diff --git a/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs b/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs index 2e99cec606..bf25788023 100644 --- a/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs +++ b/BizHawk.Emulation.Cores/Waterbox/ElfRunner.cs @@ -13,7 +13,7 @@ using System.IO; using System.Collections.Concurrent; using System.Threading; using BizHawk.Emulation.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; namespace BizHawk.Emulation.Cores.Waterbox { diff --git a/BizHawk.Emulation.Cores/Waterbox/Heap.cs b/BizHawk.Emulation.Cores/Waterbox/Heap.cs index 66a5b1fdaa..9e8f94976c 100644 --- a/BizHawk.Emulation.Cores/Waterbox/Heap.cs +++ b/BizHawk.Emulation.Cores/Waterbox/Heap.cs @@ -1,4 +1,4 @@ -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Common; using System; using System.Collections.Generic; diff --git a/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs b/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs index c3b3e1c647..85f843beb9 100644 --- a/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs +++ b/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Common; using System; using System.Collections.Generic; diff --git a/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs b/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs index 19db1bafbb..e28ba4785b 100644 --- a/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs +++ b/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.IO; using System.Runtime.InteropServices; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; namespace BizHawk.Emulation.Cores.Waterbox { diff --git a/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs b/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs index d6c36054eb..0bf48dbcad 100644 --- a/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs +++ b/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Common; using PeNet; using System; diff --git a/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs b/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs index f02280e47c..04c9f3d21f 100644 --- a/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs +++ b/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Emulation.Common; using PeNet; using System; diff --git a/BizHawk.Emulation.Cores/Waterbox/Swappable.cs b/BizHawk.Emulation.Cores/Waterbox/Swappable.cs index 5536fa297d..dc04aceea3 100644 --- a/BizHawk.Emulation.Cores/Waterbox/Swappable.cs +++ b/BizHawk.Emulation.Cores/Waterbox/Swappable.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Common.BufferExtensions; using System; using System.Collections.Concurrent; diff --git a/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs b/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs index cb572e335a..5121d13e8f 100644 --- a/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs +++ b/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs @@ -1,5 +1,5 @@ using BizHawk.Common; -using BizHawk.Common.BizInvoke; +using BizHawk.BizInvoke; using BizHawk.Common.BufferExtensions; using BizHawk.Emulation.Common; using System; diff --git a/BizHawk.sln b/BizHawk.sln index b385c32526..d23b9d6f68 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Bizware.BizwareGL", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Client.ApiHawk", "BizHawk.Client.ApiHawk\BizHawk.Client.ApiHawk.csproj", "{8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.BizInvoke", "BizHawk.BizInvoke\BizHawk.BizInvoke.csproj", "{E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -95,6 +97,10 @@ Global {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E2F11F2-3955-4382-8C3A-CEBA1276CAEA}.Release|Any CPU.Build.0 = Release|Any CPU + {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5D76DC1-84A8-47AF-BE25-E76F06D2FBBC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE