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);