From 1b7438fe114c082a4b10f67bd40c3684d07079ba Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Tue, 21 May 2024 19:24:17 +0900 Subject: [PATCH] Fix iOS/Android projects, always use SDL3 on them --- osu.Framework.Android/AndroidGameHost.cs | 2 +- osu.Framework.Android/AndroidGameWindow.cs | 1 + osu.Framework.iOS/IOSGameHost.cs | 2 +- osu.Framework.iOS/IOSWindow.cs | 1 + osu.Framework/FrameworkEnvironment.cs | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/osu.Framework.Android/AndroidGameHost.cs b/osu.Framework.Android/AndroidGameHost.cs index 6377b1c12..9754a275e 100644 --- a/osu.Framework.Android/AndroidGameHost.cs +++ b/osu.Framework.Android/AndroidGameHost.cs @@ -21,7 +21,7 @@ using Uri = Android.Net.Uri; namespace osu.Framework.Android { - public class AndroidGameHost : SDL3GameHost + public class AndroidGameHost : SDLGameHost { private readonly AndroidGameActivity activity; diff --git a/osu.Framework.Android/AndroidGameWindow.cs b/osu.Framework.Android/AndroidGameWindow.cs index 3b11e588b..457d5e1eb 100644 --- a/osu.Framework.Android/AndroidGameWindow.cs +++ b/osu.Framework.Android/AndroidGameWindow.cs @@ -4,6 +4,7 @@ using System; using osu.Framework.Bindables; using osu.Framework.Platform; +using osu.Framework.Platform.SDL3; namespace osu.Framework.Android { diff --git a/osu.Framework.iOS/IOSGameHost.cs b/osu.Framework.iOS/IOSGameHost.cs index 9c2e1256f..813d6133e 100644 --- a/osu.Framework.iOS/IOSGameHost.cs +++ b/osu.Framework.iOS/IOSGameHost.cs @@ -21,7 +21,7 @@ using UIKit; namespace osu.Framework.iOS { - public class IOSGameHost : SDL3GameHost + public class IOSGameHost : SDLGameHost { public IOSGameHost() : base(string.Empty) diff --git a/osu.Framework.iOS/IOSWindow.cs b/osu.Framework.iOS/IOSWindow.cs index de8d04e54..674156ec7 100644 --- a/osu.Framework.iOS/IOSWindow.cs +++ b/osu.Framework.iOS/IOSWindow.cs @@ -10,6 +10,7 @@ using ObjCRuntime; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Platform; +using osu.Framework.Platform.SDL3; using SDL; using UIKit; diff --git a/osu.Framework/FrameworkEnvironment.cs b/osu.Framework/FrameworkEnvironment.cs index d596ea95d..5b4b5ee8e 100644 --- a/osu.Framework/FrameworkEnvironment.cs +++ b/osu.Framework/FrameworkEnvironment.cs @@ -53,7 +53,7 @@ namespace osu.Framework if (DebugUtils.IsDebugBuild) AllowInsecureRequests = parseBool(Environment.GetEnvironmentVariable("OSU_INSECURE_REQUESTS")) ?? false; - UseSDL3 = parseBool(Environment.GetEnvironmentVariable("OSU_SDL3")) ?? false; + UseSDL3 = RuntimeInfo.IsMobile || (parseBool(Environment.GetEnvironmentVariable("OSU_SDL3")) ?? false); } private static bool? parseBool(string? value)