diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 7d517f7f68..ac3857f996 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,6 +22,6 @@
-
+
\ No newline at end of file
diff --git a/osu.iOS/AppDelegate.cs b/osu.iOS/AppDelegate.cs
index df8ddf6aea..ffbc4bdd63 100644
--- a/osu.iOS/AppDelegate.cs
+++ b/osu.iOS/AppDelegate.cs
@@ -1,59 +1,15 @@
using Foundation;
-using UIKit;
+using osu.Framework.iOS;
+using osu.Game;
namespace osu.iOS
{
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to application events from iOS.
[Register("AppDelegate")]
- public class AppDelegate : UIApplicationDelegate
+ public class AppDelegate : GameAppDelegate
{
- // class-level declarations
-
- public override UIWindow Window
- {
- get;
- set;
- }
-
- public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
- {
- // Override point for customization after application launch.
- // If not required for your application you can safely delete this method
-
- return true;
- }
-
- public override void OnResignActivation(UIApplication application)
- {
- // Invoked when the application is about to move from active to inactive state.
- // This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message)
- // or when the user quits the application and it begins the transition to the background state.
- // Games should use this method to pause the game.
- }
-
- public override void DidEnterBackground(UIApplication application)
- {
- // Use this method to release shared resources, save user data, invalidate timers and store the application state.
- // If your application supports background exection this method is called instead of WillTerminate when the user quits.
- }
-
- public override void WillEnterForeground(UIApplication application)
- {
- // Called as part of the transiton from background to active state.
- // Here you can undo many of the changes made on entering the background.
- }
-
- public override void OnActivated(UIApplication application)
- {
- // Restart any tasks that were paused (or not yet started) while the application was inactive.
- // If the application was previously in the background, optionally refresh the user interface.
- }
-
- public override void WillTerminate(UIApplication application)
- {
- // Called when the application is about to terminate. Save data, if needed. See also DidEnterBackground.
- }
+ protected override Framework.Game CreateGame() => new OsuGame();
}
}
diff --git a/osu.iOS/Info.plist b/osu.iOS/Info.plist
index e5062b909a..5305348381 100644
--- a/osu.iOS/Info.plist
+++ b/osu.iOS/Info.plist
@@ -25,8 +25,6 @@
UISupportedInterfaceOrientations
- UIInterfaceOrientationPortrait
- UIInterfaceOrientationPortraitUpsideDown
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
diff --git a/osu.iOS/Linker.xml b/osu.iOS/Linker.xml
new file mode 100644
index 0000000000..04591c55d0
--- /dev/null
+++ b/osu.iOS/Linker.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 603871c71f..b223e59ff2 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -45,6 +45,7 @@
ARM64
NSUrlSessionHandler
+ --nolinkaway -gcc_flags "-lstdc++ -framework AudioToolbox -framework SystemConfiguration -framework CFNetwork -framework Accelerate -force_load libbass.a -force_load libbass_fx.a"
pdbonly
@@ -69,17 +70,16 @@
prompt
4
iPhone Developer
- true
true
true
- true
- true
Entitlements.plist
13079
SdkOnly
ARM64
NSUrlSessionHandler
+ --nolinkaway -gcc_flags "-lstdc++ -framework AudioToolbox -framework SystemConfiguration -framework CFNetwork -framework Accelerate -force_load libbass.a -force_load libbass_fx.a"
+ cjk,mideast,other,rare,west
@@ -156,10 +156,91 @@
..\packages\ppy.osuTK.iOS.1.0.41\lib\xamarinios10\osuTK.iOS.dll
- ..\packages\ppy.osu.Framework.0.0.7620\lib\netstandard2.0\osu.Framework.dll
+ ..\packages\ppy.osu.Framework.0.0.7626\lib\netstandard2.0\osu.Framework.dll
- ..\packages\ppy.osu.Framework.iOS.0.0.7620\lib\xamarinios10\osu.Framework.iOS.dll
+ ..\packages\ppy.osu.Framework.iOS.0.0.7626\lib\xamarinios10\osu.Framework.iOS.dll
+
+
+ ..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\netstandard2.0\System.Configuration.ConfigurationManager.dll
+
+
+ ..\packages\SharpRaven.2.4.0\lib\netstandard2.0\SharpRaven.dll
+
+
+ ..\packages\Humanizer.Core.2.5.1\lib\netstandard2.0\Humanizer.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.Abstractions.2.1.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll
+
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
+
+
+ ..\packages\Remotion.Linq.2.2.0\lib\portable-net45+win+wpa81+wp80\Remotion.Linq.dll
+
+
+ ..\packages\SQLitePCLRaw.core.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.core.dll
+
+
+ ..\packages\Microsoft.Data.Sqlite.Core.2.1.0\lib\netstandard2.0\Microsoft.Data.Sqlite.dll
+
+
+ ..\packages\SQLitePCLRaw.provider.sqlite3.ios_unified.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.provider.sqlite3.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll
+
+
+ ..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll
+
+
+ ..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll
+
+
+ ..\packages\System.Interactive.Async.3.1.1\lib\netstandard1.3\System.Interactive.Async.dll
+
+
+ ..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll
+
+
+ ..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Configuration.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll
+
+
+ ..\packages\Microsoft.Extensions.Configuration.Binder.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll
+
+
+ ..\packages\Microsoft.Extensions.Options.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll
+
+
+ ..\packages\Microsoft.Extensions.Caching.Memory.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll
+
+
+ ..\packages\Microsoft.Extensions.Logging.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.2.1.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.Relational.2.1.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.1.4\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll
+
+
+ ..\packages\SharpCompress.0.22.0\lib\netstandard2.0\SharpCompress.dll
@@ -229,6 +310,9 @@
osu.Game.Rulesets.Taiko
+
+
+
\ No newline at end of file
diff --git a/osu.iOS/packages.config b/osu.iOS/packages.config
index 00568b39c1..9ea8058a99 100644
--- a/osu.iOS/packages.config
+++ b/osu.iOS/packages.config
@@ -1,6 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8,31 +50,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,7 +125,7 @@
-
+