ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 19:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using the global namespace in the MINIMAL configuration, as it confuses the Mono compiler.

Browse source
This commit is contained in:
the_fiddler 2011-12-08 00:10:03 +00:00
parent 7bcbfc7072
commit e8590dddd4
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Source/OpenTK/Minimal.cs
View file

@ -2175,23 +2175,28 @@ namespace OpenTK
#endregion
}
#region Graphics
sealed class Graphics : IDisposable
// Need a different namespace to avoid clash with OpenTK.Graphics.
namespace OpenTK.Minimal
{
public static Graphics FromImage(OpenTK.Image img)
#region Graphics
sealed class Graphics : IDisposable
{
return new Graphics();
public static Graphics FromImage(OpenTK.Image img)
{
return new Graphics();
}
public void Dispose()
{ }
internal void DrawImage(OpenTK.Bitmap bitmap, int p, int p_2, int p_3, int p_4)
{
}
}
public void Dispose()
{ }
internal void DrawImage(OpenTK.Bitmap bitmap, int p, int p_2, int p_3, int p_4)
{
}
#endregion
}
#endregion
#endif

2
Source/OpenTK/Platform/MacOS/CarbonGLNative.cs
View file

@ -755,7 +755,7 @@ namespace OpenTK.Platform.MacOS
bitmap = new Bitmap(128, 128);
#if MINIMAL
using (global::Graphics g = global::Graphics.FromImage(bitmap))
using (OpenTK.Minimal.Graphics g = OpenTK.Minimal.Graphics.FromImage(bitmap))
#else
using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap))
#endif