Update osu! iOS/Android native references (#5665)

Update osu! iOS/Android native references Co-authored-by: Dean Herbert <pe@ppy.sh>
2024-09-22 01:27:29 +08:00 · 2019-08-13 20:50:00 +09:00 · 2019-08-13 20:50:00 +09:00 · 65299bd2c3
commit 65299bd2c3
parent b05c0012f5 6d18f151fd
16 changed files with 19 additions and 54 deletions
--- a/osu.Android.props
+++ b/osu.Android.props
@ -49,9 +49,7 @@
    <None Include="$(MSBuildThisFileDirectory)\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
-    <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)\osu.Android\lib\**\*.so">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="$(OutputPath)\**\*.so" />
  </ItemGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/osu.Android/lib/arm64-v8a/libbass.so
+++ b/osu.Android/lib/arm64-v8a/libbass.so
--- a/osu.Android/lib/arm64-v8a/libbass_fx.so
+++ b/osu.Android/lib/arm64-v8a/libbass_fx.so
--- a/osu.Android/lib/armeabi-v7a/libbass.so
+++ b/osu.Android/lib/armeabi-v7a/libbass.so
--- a/osu.Android/lib/armeabi-v7a/libbass_fx.so
+++ b/osu.Android/lib/armeabi-v7a/libbass_fx.so
--- a/osu.Android/lib/x86/libbass.so
+++ b/osu.Android/lib/x86/libbass.so
--- a/osu.Android/lib/x86/libbass_fx.so
+++ b/osu.Android/lib/x86/libbass_fx.so
--- a/osu.Game.Rulesets.Catch.Tests.iOS/osu.Game.Rulesets.Catch.Tests.iOS.csproj
+++ b/osu.Game.Rulesets.Catch.Tests.iOS/osu.Game.Rulesets.Catch.Tests.iOS.csproj
@ -13,14 +13,6 @@
  <ItemGroup>
    <None Include="Info.plist" />
    <None Include="Entitlements.plist" />
-    <None Include="..\osu.iOS\libbass.a">
-      <Link>libbass.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\osu.iOS\libbass_fx.a">
-      <Link>libbass_fx.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
    <LinkDescription Include="..\osu.iOS\Linker.xml">
      <Link>Linker.xml</Link>
    </LinkDescription>
--- a/osu.Game.Rulesets.Mania.Tests.iOS/osu.Game.Rulesets.Mania.Tests.iOS.csproj
+++ b/osu.Game.Rulesets.Mania.Tests.iOS/osu.Game.Rulesets.Mania.Tests.iOS.csproj
@ -13,14 +13,6 @@
  <ItemGroup>
    <None Include="Info.plist" />
    <None Include="Entitlements.plist" />
-    <None Include="..\osu.iOS\libbass.a">
-      <Link>libbass.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\osu.iOS\libbass_fx.a">
-      <Link>libbass_fx.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
    <LinkDescription Include="..\osu.iOS\Linker.xml">
      <Link>Linker.xml</Link>
    </LinkDescription>
--- a/osu.Game.Rulesets.Osu.Tests.iOS/osu.Game.Rulesets.Osu.Tests.iOS.csproj
+++ b/osu.Game.Rulesets.Osu.Tests.iOS/osu.Game.Rulesets.Osu.Tests.iOS.csproj
@ -13,14 +13,6 @@
  <ItemGroup>
    <None Include="Info.plist" />
    <None Include="Entitlements.plist" />
-    <None Include="..\osu.iOS\libbass.a">
-      <Link>libbass.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\osu.iOS\libbass_fx.a">
-      <Link>libbass_fx.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
    <LinkDescription Include="..\osu.iOS\Linker.xml">
      <Link>Linker.xml</Link>
    </LinkDescription>
--- a/osu.Game.Rulesets.Taiko.Tests.iOS/osu.Game.Rulesets.Taiko.Tests.iOS.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests.iOS/osu.Game.Rulesets.Taiko.Tests.iOS.csproj
@ -13,14 +13,6 @@
  <ItemGroup>
    <None Include="Info.plist" />
    <None Include="Entitlements.plist" />
-    <None Include="..\osu.iOS\libbass.a">
-      <Link>libbass.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\osu.iOS\libbass_fx.a">
-      <Link>libbass_fx.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
    <LinkDescription Include="..\osu.iOS\Linker.xml">
      <Link>Linker.xml</Link>
    </LinkDescription>
--- a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
+++ b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
@ -13,14 +13,6 @@
  <ItemGroup>
    <None Include="Info.plist" />
    <None Include="Entitlements.plist" />
-    <None Include="..\osu.iOS\libbass.a">
-      <Link>libbass.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\osu.iOS\libbass_fx.a">
-      <Link>libbass_fx.a</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
    <LinkDescription Include="..\osu.iOS\Linker.xml">
      <Link>Linker.xml</Link>
    </LinkDescription>
--- a/osu.iOS.props
+++ b/osu.iOS.props
@ -3,7 +3,8 @@
    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <DefaultMtouchExtraArgs>--nolinkaway -gcc_flags "-lstdc++ -framework AudioToolbox -framework SystemConfiguration -framework CFNetwork -framework Accelerate</DefaultMtouchExtraArgs>
+    <DefaultMtouchExtraArgs>--nolinkaway</DefaultMtouchExtraArgs>
+    <DefaultMtouchGccFlags>-lstdc++ -lbz2 -framework AudioToolbox -framework AVFoundation -framework CoreMedia -framework VideoToolbox -framework SystemConfiguration -framework CFNetwork -framework Accelerate</DefaultMtouchGccFlags>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
    <DebugSymbols>true</DebugSymbols>
@ -24,7 +25,7 @@
    <DeviceSpecificBuild>false</DeviceSpecificBuild>
    <MtouchVerbosity></MtouchVerbosity>
    <LangVersion>Default</LangVersion>
-    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -force_load $(OutputPath)\libbass.a -force_load $(OutputPath)\libbass_fx.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -gcc_flags "$(DefaultMtouchGccFlags)"</MtouchExtraArgs>
    <OptimizePNGs>false</OptimizePNGs>
    <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
  </PropertyGroup>
@ -44,7 +45,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
    <MtouchVerbosity></MtouchVerbosity>
    <LangVersion>Default</LangVersion>
-    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -force_load $(OutputPath)\libbass.a -force_load $(OutputPath)\libbass_fx.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -gcc_flags "$(DefaultMtouchGccFlags)"</MtouchExtraArgs>
    <OptimizePNGs>false</OptimizePNGs>
    <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
  </PropertyGroup>
@ -62,7 +63,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
    <MtouchVerbosity></MtouchVerbosity>
    <LangVersion>Default</LangVersion>
-    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -force_load $(OutputPath)\libbass.a -force_load $(OutputPath)\libbass_fx.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -gcc_flags "$(DefaultMtouchGccFlags)"</MtouchExtraArgs>
    <OptimizePNGs>false</OptimizePNGs>
    <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
  </PropertyGroup>
@ -86,10 +87,22 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
    <MtouchVerbosity></MtouchVerbosity>
    <LangVersion>Default</LangVersion>
-    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -force_load $(OutputPath)\libbass.a -force_load $(OutputPath)\libbass_fx.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>$(DefaultMtouchExtraArgs) -gcc_flags "$(DefaultMtouchGccFlags)"</MtouchExtraArgs>
    <OptimizePNGs>false</OptimizePNGs>
    <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
  </PropertyGroup>
+  <ItemGroup>
+    <NativeReference Include="$(OutputPath)\libbass.a;$(OutputPath)\libbass_fx.a">
+      <Kind>Static</Kind>
+      <SmartLink>False</SmartLink>
+      <ForceLoad>True</ForceLoad>
+    </NativeReference>
+    <NativeReference Include="$(OutputPath)\libavcodec.a;$(OutputPath)\libavdevice.a;$(OutputPath)\libavfilter.a;$(OutputPath)\libavformat.a;$(OutputPath)\libavutil.a;$(OutputPath)\libswresample.a;$(OutputPath)\libswscale.a">
+      <Kind>Static</Kind>
+      <SmartLink>False</SmartLink>
+      <ForceLoad>True</ForceLoad>
+    </NativeReference>
+  </ItemGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Xml" />
--- a/osu.iOS/libbass.a
+++ b/osu.iOS/libbass.a
--- a/osu.iOS/libbass_fx.a
+++ b/osu.iOS/libbass_fx.a
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@ -19,12 +19,6 @@
  <ItemGroup>
    <None Include="Info.plist" />
    <None Include="Entitlements.plist" />
-    <None Include="libbass_fx.a">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="libbass.a">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Application.cs" />