From 4278538317288d147f71c91f8d8a37f7fc4e27b8 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Fri, 6 Nov 2009 17:58:35 +0000 Subject: [PATCH] MacOS can have an X server installed. Modified the code so that it prefers the native Carbon/Quartz platform driver over X in this case. --- Source/OpenTK/Platform/Factory.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/OpenTK/Platform/Factory.cs b/Source/OpenTK/Platform/Factory.cs index 591dabef..3ac7c3da 100644 --- a/Source/OpenTK/Platform/Factory.cs +++ b/Source/OpenTK/Platform/Factory.cs @@ -46,15 +46,15 @@ namespace OpenTK.Platform static Factory() { if (Configuration.RunningOnWindows) Default = new Windows.WinFactory(); - else if (Configuration.RunningOnX11) Default = new X11.X11Factory(); else if (Configuration.RunningOnMacOS) Default = new MacOS.MacOSFactory(); + else if (Configuration.RunningOnX11) Default = new X11.X11Factory(); else Default = new UnsupportedPlatform(); if (Egl.Egl.IsSupported) { if (Configuration.RunningOnWindows) Embedded = new Egl.EglWinPlatformFactory(); - else if (Configuration.RunningOnX11) Embedded = new Egl.EglX11PlatformFactory(); else if (Configuration.RunningOnMacOS) Embedded = new Egl.EglMacPlatformFactory(); + else if (Configuration.RunningOnX11) Embedded = new Egl.EglX11PlatformFactory(); else Embedded = new UnsupportedPlatform(); } else Embedded = new UnsupportedPlatform();