ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-24 14:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not check for an X server if we detect Mac OS X. Should solve issue [#1338]: "Running apps in Mac OSX start a application called X11".

Browse source
This commit is contained in:
the_fiddler 2009-11-07 10:10:53 +00:00
parent 2e418e5b6b
commit 38a8efb649
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/OpenTK/Configuration.cs
View file

@ -53,8 +53,6 @@ namespace OpenTK
else if (System.Environment.OSVersion.Platform == PlatformID.Unix || else if (System.Environment.OSVersion.Platform == PlatformID.Unix ||
System.Environment.OSVersion.Platform == (PlatformID)4) System.Environment.OSVersion.Platform == (PlatformID)4)
{ {
try { runningOnX11 = OpenTK.Platform.X11.API.DefaultDisplay != IntPtr.Zero; }
catch { }
// Distinguish between Unix and Mac OS X kernels. // Distinguish between Unix and Mac OS X kernels.
switch (DetectUnixKernel()) switch (DetectUnixKernel())
@ -79,6 +77,16 @@ namespace OpenTK
else else
throw new PlatformNotSupportedException("Unknown platform. Please report this error at http://www.opentk.com."); throw new PlatformNotSupportedException("Unknown platform. Please report this error at http://www.opentk.com.");
// Detect whether X is present.
// Hack: it seems that this check will cause X to initialize itself on Mac OS X Leopard and newer.
// We don't want that (we'll be using the native interfaces anyway), so we'll avoid this check
// when we detect Mac OS X.
if (!RunningOnMacOS)
{
try { runningOnX11 = OpenTK.Platform.X11.API.DefaultDisplay != IntPtr.Zero; }
catch { }
}
// Detect the Mono runtime (code taken from http://mono.wikia.com/wiki/Detecting_if_program_is_running_in_Mono). // Detect the Mono runtime (code taken from http://mono.wikia.com/wiki/Detecting_if_program_is_running_in_Mono).
Type t = Type.GetType("Mono.Runtime"); Type t = Type.GetType("Mono.Runtime");
if (t != null) if (t != null)