Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set minimum macOS version to 12 #129

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Set minimum macOS version to 12 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NativeAudio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ if(APPLE)

# Set architectures to build fat library
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")

# Set minimum macOS deployment target
set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum macOS Version" FORCE)
endif()

add_definitions(-DMA_NO_JACK)
Expand Down
19 changes: 12 additions & 7 deletions vATIS.Desktop/vATIS.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@
<ApplicationIcon>Assets\MainIcon.ico</ApplicationIcon>
<Version>4.1.0-beta.1</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
<PublishAot>true</PublishAot>
</PropertyGroup>

<ItemGroup
Condition="'$(Configuration)' != 'Debug' and ('$(RuntimeIdentifier)' == 'osx-x64' or '$(RuntimeIdentifier)' == 'osx-arm64')">
<LinkerArg Include="-mmacosx-version-min=12.0" />
</ItemGroup>

<ItemGroup>
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
Expand All @@ -35,14 +40,14 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<TargetPath>libNativeAudio.so</TargetPath>
</ContentWithTargetPath>
</ItemGroup>
</ItemGroup>

<ItemGroup Condition="$([System.OperatingSystem]::IsMacOS())">
<ContentWithTargetPath Include=".\Voice\Audio\Native\macos\libNativeAudio.dylib">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<TargetPath>libNativeAudio.dylib</TargetPath>
</ContentWithTargetPath>
</ItemGroup>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.2" />
Expand All @@ -66,16 +71,16 @@
<PackageReference Include="Serilog.Sinks.Trace" Version="4.0.0" />
<PackageReference Include="Slugify.Core" Version="4.0.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
<PackageReference Include="Velopack" Version="0.0.942" />
<PackageReference Include="WatsonWebsocket" Version="4.1.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AvaloniaEdit\src\AvaloniaEdit\AvaloniaEdit.csproj" />
<ProjectReference Include="..\Vatsim.Network\Vatsim.Network.csproj" />
<ProjectReference Include="..\AvaloniaEdit\src\AvaloniaEdit\AvaloniaEdit.csproj" />
<ProjectReference Include="..\Vatsim.Network\Vatsim.Network.csproj" />
</ItemGroup>
</Project>