Skip to content

Commit a866e06

Browse files
committed
final config for cmake and targets
1 parent b9a97bf commit a866e06

File tree

17 files changed

+39
-9
lines changed

17 files changed

+39
-9
lines changed
0 Bytes
Binary file not shown.

H264Sharp/H264Sharp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
66
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
77
<Title>H264Sharp</Title>
8-
<Version>1.9.9</Version>
8+
<Version>1.6.0</Version>
99
<PackageProjectUrl>https://github.com/ReferenceType/H264Sharp</PackageProjectUrl>
1010
<Authors>ReferenceType</Authors>
1111
<RepositoryUrl>https://github.com/ReferenceType/H264Sharp</RepositoryUrl>
@@ -21,7 +21,7 @@
2121
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2222
<PackageLicenseFile>Licence.txt</PackageLicenseFile>
2323
<IncludeContentInPack>true</IncludeContentInPack>
24-
<SignAssembly>False</SignAssembly>
24+
<SignAssembly>True</SignAssembly>
2525
<DelaySign>False</DelaySign>
2626
<AssemblyOriginatorKeyFile>bin\Release\netstandard2.0\MyKey.snk</AssemblyOriginatorKeyFile>
2727
<!--<AssemblyOriginatorKeyFile>bin\Release\netstandard2.0\MyKey.snk</AssemblyOriginatorKeyFile>-->

H264Sharp/build/H264Sharp.targets

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,38 @@
2626
Visible="false" />
2727
</ItemGroup>
2828

29-
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
30-
<!-- Linux -->
29+
<!-- Linux x64 -->
30+
<ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND ('$(RuntimeIdentifier)' == 'linux-x64' OR ('$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'X64'))">
3131
<None Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x64\**\*.*"
3232
Link="%(Filename)%(Extension)"
3333
CopyToOutputDirectory="PreserveNewest"
3434
Visible="false" />
3535
</ItemGroup>
3636

37+
<!-- Linux x86 -->
38+
<ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND ('$(RuntimeIdentifier)' == 'linux-x86' OR ('$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'X86'))">
39+
<None Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x86\**\*.*"
40+
Link="%(Filename)%(Extension)"
41+
CopyToOutputDirectory="PreserveNewest"
42+
Visible="false" />
43+
</ItemGroup>
44+
45+
<!-- Linux ARM -->
46+
<ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND ('$(RuntimeIdentifier)' == 'linux-arm' OR ('$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'Arm'))">
47+
<None Include="$(MSBuildThisFileDirectory)..\runtimes\linux-arm\**\*.*"
48+
Link="%(Filename)%(Extension)"
49+
CopyToOutputDirectory="PreserveNewest"
50+
Visible="false" />
51+
</ItemGroup>
52+
53+
<!-- Linux ARM64 -->
54+
<ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND ('$(RuntimeIdentifier)' == 'linux-arm64' OR ('$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)' == 'Arm64'))">
55+
<None Include="$(MSBuildThisFileDirectory)..\runtimes\linux-arm64\**\*.*"
56+
Link="%(Filename)%(Extension)"
57+
CopyToOutputDirectory="PreserveNewest"
58+
Visible="false" />
59+
</ItemGroup>
60+
3761
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
3862
<!-- macOS -->
3963
<None Include="$(MSBuildThisFileDirectory)..\runtimes\osx-x64\**\*.*"
311 KB
Binary file not shown.
-3.26 KB
Binary file not shown.
370 KB
Binary file not shown.
Binary file not shown.

H264Sharp/runtimes/linux-arm32/native/libopenh264-2.4.1-linux-arm.7.so renamed to H264Sharp/runtimes/linux-arm/native/libopenh264-2.4.1-linux-arm.7.so

File renamed without changes.
Binary file not shown.
-856 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)