From 77b249f68e1af08eeb778df27cdd6d03f975d5e3 Mon Sep 17 00:00:00 2001
From: pjgat09 <pjgat09@gmail.com>
Date: Tue, 6 Aug 2013 02:27:20 +0000
Subject: [PATCH] N64: Allow you to enable the Glide64mk2 plugin

---
 BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs     | 4 ++++
 BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
index 3b68d5d414..958ed127ce 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
@@ -425,6 +425,10 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 			{
 				VidDllName = "mupen64plus-video-glide64.dll";
 			}
+			else if (video_settings.PluginName == "Glide64mk2")
+			{
+				VidDllName = "mupen64plus-video-glide64mk2.dll";
+			}
 			else
 			{
 				throw new InvalidOperationException(string.Format("Unknown plugin \"" + video_settings.PluginName));
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
index 4e62052b2f..89d197dc64 100644
--- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
+++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
@@ -293,7 +293,8 @@
 			this.PluginComboBox.FormattingEnabled = true;
 			this.PluginComboBox.Items.AddRange(new object[] {
             "Rice",
-            "Glide64"});
+            "Glide64",
+            "Glide64mk2"});
 			this.PluginComboBox.Location = new System.Drawing.Point(13, 34);
 			this.PluginComboBox.Name = "PluginComboBox";
 			this.PluginComboBox.Size = new System.Drawing.Size(173, 21);