From 02c4f05d27aa82b7e10370fd804d3fc45310001d Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 11 Apr 2021 23:15:23 +0200
Subject: [PATCH] Fixing the copy step

---
 Kyoo/Kyoo.csproj | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj
index 0150e934..ead9f601 100644
--- a/Kyoo/Kyoo.csproj
+++ b/Kyoo/Kyoo.csproj
@@ -26,6 +26,12 @@
 		<IsLinux Condition="$([MSBuild]::IsOSPlatform('Linux'))">true</IsLinux>
 	</PropertyGroup>
 
+	<PropertyGroup>
+		<TranscoderBinary Condition="'$(IsWindows)' == 'true'">transcoder.dll</TranscoderBinary>
+		<TranscoderBinary Condition="'$(IsOSX)' == 'true'">libtranscoder.dylib</TranscoderBinary>
+		<TranscoderBinary Condition="'$(IsLinux)' == 'true'">libtranscoder.so</TranscoderBinary>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="../Kyoo.Common/Kyoo.Common.csproj" />
 		<ProjectReference Include="../Kyoo.CommonAPI/Kyoo.CommonAPI.csproj" />
@@ -62,12 +68,6 @@
 		<Content Remove="$(SpaRoot)**" />
 	</ItemGroup>
 
-	<Target Name="Log OS" BeforeTargets="BuildTranscoder">
-		<Message Text="IsWindows: $(IsWindows)" Importance="High" />
-		<Message Text="IsOSX: $(IsOSX)" Importance="High" />
-		<Message Text="IsLinux: $(IsLinux)" Importance="High" />
-	</Target>
-
 	<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish" Condition="'$(SkipWebApp)' != 'true'">
 		<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
 		<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build -- --prod" />
@@ -114,18 +114,12 @@
 
 	<Target Name="BuildTranscoder" BeforeTargets="BeforeBuild" Condition="'$(SkipTranscoder)' != 'true'">
 		<Exec WorkingDirectory="$(TranscoderRoot)" Command="mkdir -p build %26%26 cd build %26%26 cmake .. %26%26 make -j" />
-		<Copy SourceFiles="$(TranscoderRoot)/build/libtranscoder.so" DestinationFolder="." />
+		<Copy SourceFiles="$(TranscoderRoot)/build/$(TranscoderBinary)" DestinationFolder="." />
 	</Target>
 	
 	<ItemGroup Condition="'$(SkipTranscoder)' != 'true'">
-		<None Include="transcoder.dll" Condition="'$(IsWindows)' == 'true'">
+		<None Include="$(TranscoderBinary)">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Include="libtranscoder.dylib" Condition="'$(IsOSX)' == 'true'">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="libtranscoder.so" Condition="'$(IsLinux)' == 'true'">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>                                 	
-		</None>
 	</ItemGroup>
 </Project>