pkgs/by-name/me/mesen/dont-zip-libraries.patch

   1 diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs
   2 index 56c1ff1..ed5fe8a 100644
   3 --- a/UI/Config/ConfigManager.cs
   4 +++ b/UI/Config/ConfigManager.cs
   5 @@ -51,7 +51,6 @@ namespace Mesen.Config
   6                         } else {
   7                                 homeFolder = DefaultDocumentsFolder;
   8                         }
   9 -                       Program.ExtractNativeDependencies(homeFolder);
  10                         _homeFolder = homeFolder;
  11                         Config.Save();
  12                 }
  13 diff --git a/UI/Program.cs b/UI/Program.cs
  14 index dfc4ba3..632cef2 100644
  15 --- a/UI/Program.cs
  16 +++ b/UI/Program.cs
  17 @@ -54,8 +54,6 @@ namespace Mesen
  18                         Environment.CurrentDirectory = ConfigManager.HomeFolder;
  19
  20                         if(!File.Exists(ConfigManager.GetConfigFile())) {
  21 -                               //Could not find configuration file, show wizard
  22 -                               ExtractNativeDependencies(ConfigManager.HomeFolder);
  23                                 App.ShowConfigWindow = true;
  24                                 BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose);
  25                                 if(File.Exists(ConfigManager.GetConfigFile())) {
  26 @@ -68,9 +66,6 @@ namespace Mesen
  27                         //Start loading config file in a separate thread
  28                         Task.Run(() => ConfigManager.LoadConfig());
  29
  30 -                       //Extract core dll & other native dependencies
  31 -                       ExtractNativeDependencies(ConfigManager.HomeFolder);
  32 -
  33                         if(CommandLineHelper.IsTestRunner(args)) {
  34                                 return TestRunner.Run(args);
  35                         }
  36 @@ -147,7 +142,7 @@ namespace Mesen
  37                                                 libraryName = libraryName + ".dylib";
  38                                         }
  39                                 }
  40 -                               return NativeLibrary.Load(Path.Combine(ConfigManager.HomeFolder, libraryName));
  41 +                               return NativeLibrary.Load(Path.Combine(AppContext.BaseDirectory, libraryName));
  42                         }
  43                         return IntPtr.Zero;
  44                 }
  45 diff --git a/UI/UI.csproj b/UI/UI.csproj
  46 index 053d495..2a0eb78 100644
  47 --- a/UI/UI.csproj
  48 +++ b/UI/UI.csproj
  49 @@ -634,7 +634,6 @@
  50      <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NtscSafeArea.lua" />
  51      <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NesPianoRoll.lua" />
  52      <EmbeddedResource Include="Debugger\Utilities\LuaScripts\ReverseMode.lua" />
  53 -    <EmbeddedResource Include="Dependencies.zip" />
  54      <EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" />
  55      <EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" />
  56    </ItemGroup>
  57 @@ -644,16 +643,5 @@
  58      </AvaloniaXaml>
  59    </ItemGroup>
  60
  61 -  <Target Name="PreBuildWindows" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='win-x64'">
  62 -    <Exec Command="cd $(OutDir)&#xD;&#xA;rd Dependencies /s /q&#xD;&#xA;md Dependencies&#xD;&#xA;xcopy /s $(ProjectDir)Dependencies\* Dependencies&#xD;&#xA;copy libHarfBuzzSharp.dll Dependencies&#xD;&#xA;copy libSkiaSharp.dll Dependencies&#xD;&#xA;copy MesenCore.dll Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;del ..\Dependencies.zip&#xD;&#xA;powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force&#xD;&#xA;copy ..\Dependencies.zip $(ProjectDir)" />
  63 -  </Target>
  64 -
  65 -       <Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64'">
  66 -    <Exec Command="cd $(OutDir)&#xD;&#xA;rm -rf Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.so Dependencies&#xD;&#xA;cp libSkiaSharp.so Dependencies&#xD;&#xA;cp MesenCore.so Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
  67 -  </Target>
  68 -
  69 -       <Target Name="PreBuildOsx" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='osx-x64' Or '$(RuntimeIdentifier)'=='osx-arm64'">
  70 -    <Exec Command="cp ./Assets/MesenIcon.icns $(OutDir)&#xD;&#xA;cd $(OutDir)&#xD;&#xA;rm -R Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.dylib Dependencies&#xD;&#xA;cp libSkiaSharp.dylib Dependencies&#xD;&#xA;cp MesenCore.dylib Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" />
  71 -  </Target>
  72
  73  </Project>
  74