646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
74 lines
4.0 KiB
Diff
74 lines
4.0 KiB
Diff
diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs
|
|
index c3249cf..96c6ae0 100644
|
|
--- a/UI/Config/ConfigManager.cs
|
|
+++ b/UI/Config/ConfigManager.cs
|
|
@@ -51,7 +51,6 @@ namespace Mesen.Config
|
|
} else {
|
|
homeFolder = DefaultDocumentsFolder;
|
|
}
|
|
- DependencyHelper.ExtractNativeDependencies(homeFolder);
|
|
_homeFolder = homeFolder;
|
|
Config.Save();
|
|
}
|
|
diff --git a/UI/Program.cs b/UI/Program.cs
|
|
index dc923ab..ae7a1cc 100644
|
|
--- a/UI/Program.cs
|
|
+++ b/UI/Program.cs
|
|
@@ -54,8 +54,6 @@ namespace Mesen
|
|
Environment.CurrentDirectory = ConfigManager.HomeFolder;
|
|
|
|
if(!File.Exists(ConfigManager.GetConfigFile())) {
|
|
- //Could not find configuration file, show wizard
|
|
- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder);
|
|
App.ShowConfigWindow = true;
|
|
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose);
|
|
if(File.Exists(ConfigManager.GetConfigFile())) {
|
|
@@ -68,9 +66,6 @@ namespace Mesen
|
|
//Start loading config file in a separate thread
|
|
Task.Run(() => ConfigManager.LoadConfig());
|
|
|
|
- //Extract core dll & other native dependencies
|
|
- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder);
|
|
-
|
|
if(CommandLineHelper.IsTestRunner(args)) {
|
|
return TestRunner.Run(args);
|
|
}
|
|
@@ -105,7 +100,7 @@ namespace Mesen
|
|
libraryName = libraryName + ".dylib";
|
|
}
|
|
}
|
|
- return NativeLibrary.Load(Path.Combine(ConfigManager.HomeFolder, libraryName));
|
|
+ return NativeLibrary.Load(Path.Combine(AppContext.BaseDirectory, libraryName));
|
|
}
|
|
return IntPtr.Zero;
|
|
}
|
|
diff --git a/UI/UI.csproj b/UI/UI.csproj
|
|
index 67fe57d..65762d3 100644
|
|
--- a/UI/UI.csproj
|
|
+++ b/UI/UI.csproj
|
|
@@ -637,7 +637,6 @@
|
|
<EmbeddedResource Include="Debugger\Utilities\LuaScripts\NtscSafeArea.lua" />
|
|
<EmbeddedResource Include="Debugger\Utilities\LuaScripts\NesPianoRoll.lua" />
|
|
<EmbeddedResource Include="Debugger\Utilities\LuaScripts\ReverseMode.lua" />
|
|
- <EmbeddedResource Include="Dependencies.zip" />
|
|
<EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" />
|
|
<EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" />
|
|
</ItemGroup>
|
|
@@ -647,16 +646,4 @@
|
|
</AvaloniaXaml>
|
|
</ItemGroup>
|
|
|
|
- <Target Name="PreBuildWindows" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='win-x64'">
|
|
- <Exec Command="cd $(OutDir)
rd Dependencies /s /q
md Dependencies
xcopy /s $(ProjectDir)Dependencies\* Dependencies
copy libHarfBuzzSharp.dll Dependencies
copy libSkiaSharp.dll Dependencies
copy MesenCore.dll Dependencies
cd Dependencies
del ..\Dependencies.zip
powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force
copy ..\Dependencies.zip $(ProjectDir)" />
|
|
- </Target>
|
|
-
|
|
- <Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64' Or '$(RuntimeIdentifier)'=='linux-arm64'">
|
|
- <Exec Command="cd $(OutDir)
rm -rf Dependencies
mkdir Dependencies
cp -R $(ProjectDir)/Dependencies/* Dependencies
cp libHarfBuzzSharp.so Dependencies
cp libSkiaSharp.so Dependencies
cp MesenCore.so Dependencies
cd Dependencies
rm ../Dependencies.zip
zip -r ../Dependencies.zip *
cp ../Dependencies.zip $(ProjectDir)" />
|
|
- </Target>
|
|
-
|
|
- <Target Name="PreBuildOsx" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='osx-x64' Or '$(RuntimeIdentifier)'=='osx-arm64'">
|
|
- <Exec Command="cp ./Assets/MesenIcon.icns $(OutDir)
cd $(OutDir)
rm -R Dependencies
mkdir Dependencies
cp -R $(ProjectDir)/Dependencies/* Dependencies
cp libHarfBuzzSharp.dylib Dependencies
cp libSkiaSharp.dylib Dependencies
cp MesenCore.dylib Dependencies
cd Dependencies
rm ../Dependencies.zip
zip -r ../Dependencies.zip *
cp ../Dependencies.zip $(ProjectDir)" />
|
|
- </Target>
|
|
-
|
|
</Project>
|