Change path

xBaank · Aug 15, 2024 · 86846f9 · 86846f9
1 parent 542050c
commit 86846f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 33 deletions.
diff --git a/Console/Console.csproj b/Console/Console.csproj
@@ -58,12 +58,12 @@
 
   <Target Name="Download PortAudio before build" BeforeTargets="PreBuildEvent">
     <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)/DownloadPortAudioBin.ps1&quot; -Platform $(PortAudioPlatform) -OutputPath &quot;$(ProjectDir)/$(PortAudioFileName)&quot;" LogStandardErrorAsError="true" />
-    <Copy SourceFiles="$(ProjectDir)/$(PortAudioFileName)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(ProjectDir)/$(PortAudioFileName)" DestinationFolder="$(OutDir)/runtimes/$(PortAudioPlatform)/native" SkipUnchangedFiles="true" />
   </Target>
 
   <Target Name="Download PortAudio before publish" BeforeTargets="PrepareForPublish">
     <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(ProjectDir)/DownloadPortAudioBin.ps1&quot; -Platform $(PortAudioPlatform) -OutputPath &quot;$(ProjectDir)/$(PortAudioFileName)&quot;" LogStandardErrorAsError="true" />
-    <Copy SourceFiles="$(ProjectDir)/$(PortAudioFileName)" DestinationFolder="$(PublishDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(ProjectDir)/$(PortAudioFileName)" DestinationFolder="$(PublishDir)/runtimes/$(PortAudioPlatform)/native" SkipUnchangedFiles="true" />
   </Target>
 
 </Project>
diff --git a/Console/Utils.cs b/Console/Utils.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 using DbUp;
-using NativeLibraryManager;
 using PortAudioSharp;
 using Terminal.Gui;
 
@@ -12,36 +11,7 @@ public static class Utils
 
     public static void ConfigurePlatformDependencies()
     {
-        ResourceAccessor accessor = new(Assembly.GetExecutingAssembly());
-        LibraryManager libManager =
-            new(
-                new LibraryItem(
-                    Platform.Linux,
-                    Bitness.x64,
-                    new LibraryFile("libportaudio.so", accessor.Binary("libportaudio.so"))
-                ),
-                new LibraryItem(
-                    Platform.Linux,
-                    Bitness.x32,
-                    new LibraryFile("libportaudio.so", accessor.Binary("libportaudio.so"))
-                ),
-                new LibraryItem(
-                    Platform.MacOs,
-                    Bitness.x64,
-                    new LibraryFile("libportaudio.dylib", accessor.Binary("libportaudio.dylib"))
-                ),
-                new LibraryItem(
-                    Platform.Windows,
-                    Bitness.x64,
-                    new LibraryFile("portaudio.dll", accessor.Binary("portaudio.dll"))
-                ),
-                new LibraryItem(
-                    Platform.Windows,
-                    Bitness.x32,
-                    new LibraryFile("portaudio.dll", accessor.Binary("portaudio.dll"))
-                )
-            );
-        libManager.LoadNativeLibrary();
+        PortAudio.LoadNativeLibrary();
         PortAudio.Initialize();
     }