Fixing arch deployment & macos build

This commit is contained in:
Zoe Roux 2021-04-05 22:45:17 +02:00
parent 559b1a5e37
commit 6d820e5d60
4 changed files with 11 additions and 5 deletions

View File

@ -18,9 +18,9 @@ jobs:
# - os: windows-latest
# runtime: win-x64
# artifact: windows
# - os: macOS-latest
# runtime: osx-x64
# artifact: macos
- os: macOS-latest
runtime: osx-x64
artifact: macos
steps:
- uses: actions/checkout@v1
- name: Checkout submodules

View File

@ -17,7 +17,7 @@ namespace Kyoo.Controllers
{
private static class TranscoderAPI
{
private const string TranscoderPath = "libtranscoder.so";
private const string TranscoderPath = "transcoder";
[DllImport(TranscoderPath, CallingConvention = CallingConvention.Cdecl)]
public static extern int init();

View File

@ -111,7 +111,12 @@
</None>
</ItemGroup>
<ItemGroup>
<None Include="libtranscoder.so" Condition="$(OS) == 'Unix' and '$(SkipTranscoder)' != 'true'">
<None Include="libtranscoder.so" Condition="$([MSBuild]::IsOsPlatform('Linux')) and '$(SkipTranscoder)' != 'true'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="libtranscoder.dylib" Condition="$([MSBuild]::IsOsPlatform('OSX')) and '$(SkipTranscoder)' != 'true'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

View File

@ -14,6 +14,7 @@ install="kyoo.install"
# The output folder is needed but we can't use directory in the source array.
source=()
sha256sums=()
options=('staticlibs')
build() {
cp -a "$srcdir/../output" "$srcdir"