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 @@
-
@@ -647,16 +646,4 @@
-
-
-
-
-
-
-
-
-
-
-
-