diff --git a/BizHawk.Client.Common/Extensions.cs b/BizHawk.Client.Common/Extensions.cs
deleted file mode 100644
index c57c0b54cc..0000000000
--- a/BizHawk.Client.Common/Extensions.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using BizHawk.Bizware.BizwareGL;
-
-namespace BizHawk.Client.Common
-{
- public static class Extensions
- {
- public static IGuiRenderer CreateRenderer(this IGL gl)
- {
- if (gl is IGL_TK)
- {
- return new GuiRenderer(gl);
- }
-
- if (gl is IGL_SlimDX9)
- {
- return new GuiRenderer(gl);
- }
-
- if (gl is IGL_GdiPlus)
- {
- return new GDIPlusGuiRenderer((IGL_GdiPlus)gl);
- }
-
- throw new NotSupportedException();
- }
- }
-}
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 72d77f6cff..0e4d52bacd 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -96,9 +96,18 @@
+
+
+
+
+
+
+
+
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_GdiPlus.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/GLControlWrapper_GdiPlus.cs
similarity index 95%
rename from Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_GdiPlus.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/GLControlWrapper_GdiPlus.cs
index 3f0cfbaea2..78deedc61a 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_GdiPlus.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/GLControlWrapper_GdiPlus.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
using BizHawk.Bizware.BizwareGL;
-namespace BizHawk.Bizware.BizwareGL
+namespace BizHawk.Client.EmuHawk
{
public class GLControlWrapper_GdiPlus : Control, IGraphicsControl
{
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_SlimDX9.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/GLControlWrapper_SlimDX9.cs
similarity index 92%
rename from Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_SlimDX9.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/GLControlWrapper_SlimDX9.cs
index 40cc1f917d..247d5eb277 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/GLControlWrapper_SlimDX9.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/GLControlWrapper_SlimDX9.cs
@@ -9,7 +9,7 @@ using System.Windows.Forms;
using BizHawk.Bizware.BizwareGL;
using SlimDX.Direct3D9;
-namespace BizHawk.Bizware.BizwareGL
+namespace BizHawk.Client.EmuHawk
{
public class GLControlWrapper_SlimDX9 : Control, IGraphicsControl
{
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GraphicsControl.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl.cs
similarity index 94%
rename from Bizware/BizHawk.Bizware.BizwareGL/GraphicsControl.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl.cs
index 32f5442ec2..7b47cedfc0 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/GraphicsControl.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl.cs
@@ -1,7 +1,9 @@
using System;
using System.Windows.Forms;
-namespace BizHawk.Bizware.BizwareGL
+using BizHawk.Bizware.BizwareGL;
+
+namespace BizHawk.Client.EmuHawk
{
///
/// a base class for deriving/wrapping from a IGraphicsControl.
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GraphicsControl_TK.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl_TK.cs
similarity index 93%
rename from Bizware/BizHawk.Bizware.BizwareGL/GraphicsControl_TK.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl_TK.cs
index 3bb469d5e7..544c46312e 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/GraphicsControl_TK.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/GraphicsControl_TK.cs
@@ -11,7 +11,7 @@ using OpenTK;
using OpenTK.Graphics;
using OpenTK.Graphics.OpenGL;
-namespace BizHawk.Bizware.BizwareGL
+namespace BizHawk.Client.EmuHawk
{
class GLControlWrapper : GLControl, IGraphicsControl
{
diff --git a/BizHawk.Client.EmuHawk/GraphicsImplementations/IGLExtensions.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGLExtensions.cs
new file mode 100644
index 0000000000..0f7de4077e
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGLExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+
+using BizHawk.Bizware.BizwareGL;
+
+namespace BizHawk.Client.EmuHawk
+{
+ public static class IGLExtensions
+ {
+ public static IGuiRenderer CreateRenderer(this IGL gl) => gl switch
+ {
+ IGL_GdiPlus _ => (IGuiRenderer) new GDIPlusGuiRenderer(gl),
+ IGL_SlimDX9 _ => new GuiRenderer(gl),
+ IGL_TK _ => new GuiRenderer(gl),
+ _ => throw new NotSupportedException()
+ };
+ }
+}
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL_GdiPlus.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs
similarity index 89%
rename from Bizware/BizHawk.Bizware.BizwareGL/IGL_GdiPlus.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs
index 62b70ec935..04cdac3358 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/IGL_GdiPlus.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_GdiPlus.cs
@@ -16,7 +16,7 @@ using swf = System.Windows.Forms;
//TODO - maybe a layer to cache Graphics parameters (notably, filtering) ?
-namespace BizHawk.Bizware.BizwareGL
+namespace BizHawk.Client.EmuHawk
{
public class IGL_GdiPlus : IGL
{
@@ -62,7 +62,7 @@ namespace BizHawk.Bizware.BizwareGL
public void FreeTexture(Texture2d tex)
{
- var tw = tex.Opaque as TextureWrapper;
+ var tw = tex.Opaque as GDIPTextureWrapper;
tw.Dispose();
}
@@ -151,7 +151,7 @@ namespace BizHawk.Bizware.BizwareGL
public void TexParameter2d(Texture2d tex, TextureParameterName pname, int param)
{
- var tw = tex.Opaque as TextureWrapper;
+ var tw = tex.Opaque as GDIPTextureWrapper;
if (pname == TextureParameterName.TextureMinFilter)
tw.MinFilter = (TextureMinFilter)param;
if (pname == TextureParameterName.TextureMagFilter)
@@ -161,7 +161,7 @@ namespace BizHawk.Bizware.BizwareGL
public Texture2d LoadTexture(sd.Bitmap bitmap)
{
var sdbmp = (sd.Bitmap)bitmap.Clone();
- TextureWrapper tw = new TextureWrapper();
+ GDIPTextureWrapper tw = new GDIPTextureWrapper();
tw.SDBitmap = sdbmp;
return new Texture2d(this, tw, bitmap.Width, bitmap.Height);
}
@@ -185,7 +185,7 @@ namespace BizHawk.Bizware.BizwareGL
public void LoadTextureData(Texture2d tex, BitmapBuffer bmp)
{
- var tw = tex.Opaque as TextureWrapper;
+ var tw = tex.Opaque as GDIPTextureWrapper;
bmp.ToSysdrawingBitmap(tw.SDBitmap);
}
@@ -194,14 +194,14 @@ namespace BizHawk.Bizware.BizwareGL
{
//definitely needed (by TextureFrugalizer at least)
var sdbmp = bmp.ToSysdrawingBitmap();
- var tw = new TextureWrapper();
+ var tw = new GDIPTextureWrapper();
tw.SDBitmap = sdbmp;
return new Texture2d(this, tw, bmp.Width, bmp.Height);
}
public unsafe BitmapBuffer ResolveTexture2d(Texture2d tex)
{
- var tw = tex.Opaque as TextureWrapper;
+ var tw = tex.Opaque as GDIPTextureWrapper;
var blow = new BitmapLoadOptions()
{
AllowWrap = false //must be an independent resource
@@ -320,7 +320,7 @@ namespace BizHawk.Bizware.BizwareGL
}
else
{
- var tw = Target.Texture2d.Opaque as TextureWrapper;
+ var tw = Target.Texture2d.Opaque as GDIPTextureWrapper;
r = Target.Texture2d.Rectangle;
refGraphics = Graphics.FromImage(tw.SDBitmap);
}
@@ -368,7 +368,7 @@ namespace BizHawk.Bizware.BizwareGL
public unsafe RenderTarget CreateRenderTarget(int w, int h)
{
- TextureWrapper tw = new TextureWrapper();
+ GDIPTextureWrapper tw = new GDIPTextureWrapper();
tw.SDBitmap = new Bitmap(w,h, sdi.PixelFormat.Format32bppArgb);
var tex = new Texture2d(this, tw, w, h);
@@ -406,7 +406,7 @@ namespace BizHawk.Bizware.BizwareGL
}
else
{
- var tw = rt.Texture2d.Opaque as TextureWrapper;
+ var tw = rt.Texture2d.Opaque as GDIPTextureWrapper;
CurrentRenderTargetWrapper = rt.Opaque as RenderTargetWrapper;
_CurrentOffscreenGraphics = Graphics.FromImage(tw.SDBitmap);
//if (CurrentRenderTargetWrapper.MyBufferedGraphics == null)
@@ -429,21 +429,6 @@ namespace BizHawk.Bizware.BizwareGL
public BufferedGraphicsContext MyBufferedGraphicsContext;
- public class TextureWrapper : IDisposable
- {
- public sd.Bitmap SDBitmap;
- public TextureMinFilter MinFilter = TextureMinFilter.Nearest;
- public TextureMagFilter MagFilter = TextureMagFilter.Nearest;
- public void Dispose()
- {
- if (SDBitmap != null)
- {
- SDBitmap.Dispose();
- SDBitmap = null;
- }
- }
- }
-
} //class IGL_GdiPlus
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_SlimDX9.cs
similarity index 96%
rename from Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_SlimDX9.cs
index 7d1b210871..e1180a6fdd 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_SlimDX9.cs
@@ -21,7 +21,7 @@ using swf = System.Windows.Forms;
//todo - do a better job selecting shader model? base on caps somehow? try several and catch compilation exceptions (yuck, exceptions)
-namespace BizHawk.Bizware.BizwareGL
+namespace BizHawk.Client.EmuHawk
{
public class IGL_SlimDX9 : IGL
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL_TK.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs
similarity index 96%
rename from Bizware/BizHawk.Bizware.BizwareGL/IGL_TK.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs
index f910f39849..e1c0d76984 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/IGL_TK.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/IGL_TK.cs
@@ -25,7 +25,7 @@ using sd = System.Drawing;
using sdi = System.Drawing.Imaging;
using swf = System.Windows.Forms;
-namespace BizHawk.Bizware.BizwareGL
+namespace BizHawk.Client.EmuHawk
{
///
/// OpenTK implementation of the BizwareGL.IGL interface.
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/RetainedGraphicsControl.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/RetainedGraphicsControl.cs
similarity index 94%
rename from Bizware/BizHawk.Bizware.BizwareGL/RetainedGraphicsControl.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/RetainedGraphicsControl.cs
index 8e804d30fb..43d7fee9d1 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/RetainedGraphicsControl.cs
+++ b/BizHawk.Client.EmuHawk/GraphicsImplementations/RetainedGraphicsControl.cs
@@ -8,7 +8,7 @@ using System.Text;
using BizHawk.Bizware.BizwareGL;
using OpenTK.Graphics.OpenGL;
-namespace BizHawk.Bizware.BizwareGL
+namespace BizHawk.Client.EmuHawk
{
///
/// Adapts a GraphicsControl to gain the power of remembering what was drawn to it, and keeping it presented in response to Paint events
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/SlimDXExtensions.cs b/BizHawk.Client.EmuHawk/GraphicsImplementations/SlimDXExtensions.cs
similarity index 100%
rename from Bizware/BizHawk.Bizware.BizwareGL/SlimDXExtensions.cs
rename to BizHawk.Client.EmuHawk/GraphicsImplementations/SlimDXExtensions.cs
diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs
index ba55c4dd04..75ed9e0ddf 100644
--- a/BizHawk.Client.EmuHawk/Program.cs
+++ b/BizHawk.Client.EmuHawk/Program.cs
@@ -130,7 +130,7 @@ namespace BizHawk.Client.EmuHawk
}
// create IGL context. we do this whether or not the user has selected OpenGL, so that we can run opengl-based emulator cores
- GlobalWin.IGL_GL = new Bizware.BizwareGL.IGL_TK(2, 0, false);
+ GlobalWin.IGL_GL = new IGL_TK(2, 0, false);
// setup the GL context manager, needed for coping with multiple opengl cores vs opengl display method
GLManager.CreateInstance();
@@ -140,13 +140,13 @@ namespace BizHawk.Client.EmuHawk
REDO_DISPMETHOD:
if (Global.Config.DispMethod == EDispMethod.GdiPlus)
{
- GlobalWin.GL = new Bizware.BizwareGL.IGL_GdiPlus();
+ GlobalWin.GL = new IGL_GdiPlus();
}
else if (Global.Config.DispMethod == EDispMethod.SlimDX9)
{
try
{
- GlobalWin.GL = new Bizware.BizwareGL.IGL_SlimDX9();
+ GlobalWin.GL = new IGL_SlimDX9();
}
catch(Exception ex)
{
@@ -248,7 +248,7 @@ namespace BizHawk.Client.EmuHawk
//cleanup:
//cleanup IGL stuff so we can get better refcounts when exiting process, for debugging
//DOESNT WORK FOR SOME REASON
- //GlobalWin.IGL_GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK();
+ //GlobalWin.IGL_GL = new IGL_TK();
//GLManager.Instance.Dispose();
//if (GlobalWin.IGL_GL != GlobalWin.GL)
// GlobalWin.GL.Dispose();
diff --git a/BizHawk.Client.EmuHawk/ProjectPkgRefs.props b/BizHawk.Client.EmuHawk/ProjectPkgRefs.props
index e9c4773384..ceaa4f527d 100644
--- a/BizHawk.Client.EmuHawk/ProjectPkgRefs.props
+++ b/BizHawk.Client.EmuHawk/ProjectPkgRefs.props
@@ -6,11 +6,29 @@
Name="Newtonsoft.Json"
Private="true"
SpecificVersion="true" />
+
+
+
+
+
diff --git a/BizHawk.Client.EmuHawk/packages.config b/BizHawk.Client.EmuHawk/packages.config
index 2da82b8bc3..4c21a652e3 100644
--- a/BizHawk.Client.EmuHawk/packages.config
+++ b/BizHawk.Client.EmuHawk/packages.config
@@ -1,5 +1,8 @@
+
+
+
\ No newline at end of file
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index cf9856f091..2d891c2884 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -2,25 +2,11 @@
true
- net48
+ netstandard2.0;netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index c93ab432c5..09c54396ea 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -2,66 +2,23 @@
true
- net48
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
-
-
-
-
diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
index 51d90bfed1..c3bd6704ba 100644
--- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
+++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
@@ -2,24 +2,11 @@
true
- net48
+ netstandard2.0;netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index 95eda4b012..13814fa425 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -2,24 +2,15 @@
true
- net48
+ netstandard2.0
-
-
+
+
-
-
-
-
-
-
-
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GDIPTextureWrapper.cs b/Bizware/BizHawk.Bizware.BizwareGL/GDIPTextureWrapper.cs
new file mode 100644
index 0000000000..5aa7c8dc64
--- /dev/null
+++ b/Bizware/BizHawk.Bizware.BizwareGL/GDIPTextureWrapper.cs
@@ -0,0 +1,21 @@
+using System;
+
+using OpenTK.Graphics.OpenGL;
+
+namespace BizHawk.Bizware.BizwareGL
+{
+ public class GDIPTextureWrapper : IDisposable
+ {
+ public System.Drawing.Bitmap SDBitmap;
+ public TextureMinFilter MinFilter = TextureMinFilter.Nearest;
+ public TextureMagFilter MagFilter = TextureMagFilter.Nearest;
+ public void Dispose()
+ {
+ if (SDBitmap != null)
+ {
+ SDBitmap.Dispose();
+ SDBitmap = null;
+ }
+ }
+ }
+}
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs b/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs
index 18d9987558..86acb7dbc8 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs
+++ b/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs
@@ -15,10 +15,9 @@ namespace BizHawk.Bizware.BizwareGL
{
public class GDIPlusGuiRenderer : IGuiRenderer
{
- public GDIPlusGuiRenderer(IGL_GdiPlus gl)
+ public GDIPlusGuiRenderer(IGL gl)
{
Owner = gl;
- Gdi = gl as IGL_GdiPlus;
}
OpenTK.Graphics.Color4[] CornerColors = new OpenTK.Graphics.Color4[4] {
@@ -164,8 +163,8 @@ namespace BizHawk.Bizware.BizwareGL
public void DrawSubrect(Texture2d tex, float x, float y, float w, float h, float u0, float v0, float u1, float v1)
{
- var tw = tex.Opaque as IGL_GdiPlus.TextureWrapper;
- var g = Gdi.GetCurrentGraphics();
+ var tw = tex.Opaque as GDIPTextureWrapper;
+ var g = ((dynamic) Gdi).GetCurrentGraphics() as sd.Graphics;
PrepDraw(g, tex);
SetupMatrix(g);
@@ -200,7 +199,7 @@ namespace BizHawk.Bizware.BizwareGL
void PrepDraw(sd.Graphics g, Texture2d tex)
{
- var tw = tex.Opaque as IGL_GdiPlus.TextureWrapper;
+ var tw = tex.Opaque as GDIPTextureWrapper;
//TODO - we can support bicubic for the final presentation..
if ((int)tw.MagFilter != (int)tw.MinFilter)
throw new InvalidOperationException($"{nameof(tw)}.{nameof(tw.MagFilter)} != {nameof(tw)}.{nameof(tw.MinFilter)}");
@@ -253,7 +252,7 @@ namespace BizHawk.Bizware.BizwareGL
unsafe void DrawInternal(Texture2d tex, float x, float y, float w, float h, float u0, float v0, float u1, float v1)
{
- var g = Gdi.GetCurrentGraphics();
+ var g = ((dynamic) Gdi).GetCurrentGraphics() as sd.Graphics;
PrepDraw(g, tex);
SetupMatrix(g);
@@ -271,7 +270,7 @@ namespace BizHawk.Bizware.BizwareGL
float sw = sx2 - sx;
float sh = sy2 - sy;
- var tw = tex.Opaque as IGL_GdiPlus.TextureWrapper;
+ var tw = tex.Opaque as GDIPTextureWrapper;
g.PixelOffsetMode = sd.Drawing2D.PixelOffsetMode.Half;
g.DrawImage(tw.SDBitmap, destPoints, new sd.RectangleF(sx, sy, sw, sh), sd.GraphicsUnit.Pixel, CurrentImageAttributes);
g.Transform = new sd.Drawing2D.Matrix(); //.Reset() doesnt work ? ?
@@ -285,7 +284,7 @@ namespace BizHawk.Bizware.BizwareGL
public bool IsActive { get; private set; }
public IGL Owner { get; private set; }
- public IGL_GdiPlus Gdi;
+ public IGL Gdi => Owner;
}
}
\ No newline at end of file
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs b/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs
index d7f59a55f6..d40e9f3744 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs
+++ b/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs
@@ -5,8 +5,6 @@ using System.Drawing;
using OpenTK;
using OpenTK.Graphics.OpenGL;
-using swf = System.Windows.Forms;
-
namespace BizHawk.Bizware.BizwareGL
{
@@ -208,10 +206,12 @@ namespace BizHawk.Bizware.BizwareGL
///
void SetViewport(int width, int height);
+#if false // Unused and WinForms unavailable on .NET Standard
///
/// sets the viewport (and scissor) according to the client area of the provided control
///
- void SetViewport(swf.Control control);
+ void SetViewport(System.Windows.Forms.Control control);
+#endif
///
/// sets the viewport (and scissor) according to the provided specifications
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/RetroShader.cs b/Bizware/BizHawk.Bizware.BizwareGL/RetroShader.cs
index a261a93629..b758006cf6 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/RetroShader.cs
+++ b/Bizware/BizHawk.Bizware.BizwareGL/RetroShader.cs
@@ -1,6 +1,5 @@
using System;
using System.Drawing;
-using System.Windows.Forms;
using OpenTK;
using OpenTK.Graphics.OpenGL;
diff --git a/Common.props b/Common.props
index 45acca51b4..dba95dd90b 100644
--- a/Common.props
+++ b/Common.props
@@ -4,6 +4,7 @@
prompt
false
8.0
+ NU1701
$(SolutionDir)output/dll
AnyCPU
false