h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 17:17:46 +08:00
Code Issues Releases Wiki Activity

Remove iOS BASS libraries and properly reference

Browse Source
This commit is contained in:
Shane Woolcock 2019-08-09 19:21:08 +09:30
parent 07cf9f319c
commit b0eb2c6e28
8 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Catch.Tests.iOS/osu.Game.Rulesets.Catch.Tests.iOS.csproj
View File

@ -13,14 +13,6 @@
<ItemGroup> <ItemGroup>
<None Include="Info.plist" /> <None Include="Info.plist" />
<None Include="Entitlements.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"> <LinkDescription Include="..\osu.iOS\Linker.xml">
<Link>Linker.xml</Link> <Link>Linker.xml</Link>
</LinkDescription> </LinkDescription>

8
osu.Game.Rulesets.Mania.Tests.iOS/osu.Game.Rulesets.Mania.Tests.iOS.csproj
View File

@ -13,14 +13,6 @@
<ItemGroup> <ItemGroup>
<None Include="Info.plist" /> <None Include="Info.plist" />
<None Include="Entitlements.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"> <LinkDescription Include="..\osu.iOS\Linker.xml">
<Link>Linker.xml</Link> <Link>Linker.xml</Link>
</LinkDescription> </LinkDescription>

8
osu.Game.Rulesets.Osu.Tests.iOS/osu.Game.Rulesets.Osu.Tests.iOS.csproj
View File

@ -13,14 +13,6 @@
<ItemGroup> <ItemGroup>
<None Include="Info.plist" /> <None Include="Info.plist" />
<None Include="Entitlements.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"> <LinkDescription Include="..\osu.iOS\Linker.xml">
<Link>Linker.xml</Link> <Link>Linker.xml</Link>
</LinkDescription> </LinkDescription>

8
osu.Game.Rulesets.Taiko.Tests.iOS/osu.Game.Rulesets.Taiko.Tests.iOS.csproj
View File

@ -13,14 +13,6 @@
<ItemGroup> <ItemGroup>
<None Include="Info.plist" /> <None Include="Info.plist" />
<None Include="Entitlements.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"> <LinkDescription Include="..\osu.iOS\Linker.xml">
<Link>Linker.xml</Link> <Link>Linker.xml</Link>
</LinkDescription> </LinkDescription>

18
osu.iOS.props
View File

@ -3,7 +3,8 @@
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle> <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>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -24,7 +25,7 @@
<DeviceSpecificBuild>false</DeviceSpecificBuild> <DeviceSpecificBuild>false</DeviceSpecificBuild>
<MtouchVerbosity></MtouchVerbosity> <MtouchVerbosity></MtouchVerbosity>
<LangVersion>Default</LangVersion> <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> <OptimizePNGs>false</OptimizePNGs>
<MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n> <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
</PropertyGroup> </PropertyGroup>
@ -44,7 +45,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity> <MtouchVerbosity></MtouchVerbosity>
<LangVersion>Default</LangVersion> <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> <OptimizePNGs>false</OptimizePNGs>
<MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n> <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
</PropertyGroup> </PropertyGroup>
@ -62,7 +63,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity> <MtouchVerbosity></MtouchVerbosity>
<LangVersion>Default</LangVersion> <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> <OptimizePNGs>false</OptimizePNGs>
<MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n> <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
</PropertyGroup> </PropertyGroup>
@ -86,10 +87,17 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity> <MtouchVerbosity></MtouchVerbosity>
<LangVersion>Default</LangVersion> <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> <OptimizePNGs>false</OptimizePNGs>
<MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n> <MtouchI18n>cjk,mideast,other,rare,west</MtouchI18n>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<NativeReference Include="$(OutputPath)\libbass.a;$(OutputPath)\libbass_fx.a">
<Kind>Static</Kind>
<SmartLink>False</SmartLink>
<ForceLoad>True</ForceLoad>
</NativeReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />

BIN
osu.iOS/libbass.a
View File

Binary file not shown.

BIN
osu.iOS/libbass_fx.a
View File

Binary file not shown.

6
osu.iOS/osu.iOS.csproj
View File

@ -19,12 +19,6 @@
<ItemGroup> <ItemGroup>
<None Include="Info.plist" /> <None Include="Info.plist" />
<None Include="Entitlements.plist" /> <None Include="Entitlements.plist" />
<None Include="libbass_fx.a">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="libbass.a">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Application.cs" /> <Compile Include="Application.cs" />