ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-23 22:31:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Configuration.cs:

Browse source 
Reverted OpenTK.dll.config extraction on Mono, since it doesn't (and
unfortunately cannot) work. The config file should be bundled with the
application.
This commit is contained in:
the_fiddler 2010-12-14 11:53:29 +00:00
parent e7aef8537c
commit 23f96f4d83
1 changed files with 1 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
Source/OpenTK/Configuration.cs
View file

@ -175,14 +175,9 @@ namespace OpenTK
System.Environment.OSVersion.Platform == PlatformID.Win32S || System.Environment.OSVersion.Platform == PlatformID.Win32S ||
System.Environment.OSVersion.Platform == PlatformID.Win32Windows || System.Environment.OSVersion.Platform == PlatformID.Win32Windows ||
System.Environment.OSVersion.Platform == PlatformID.WinCE) System.Environment.OSVersion.Platform == PlatformID.WinCE)
runningOnWindows = true;
// Write config file before using any p/invokes, otherwise Mono won't pick it up.
if (!RunningOnWindows)
{ {
WriteConfigFile(); runningOnWindows = true;
} }
else if (System.Environment.OSVersion.Platform == PlatformID.Unix || else if (System.Environment.OSVersion.Platform == PlatformID.Unix ||
System.Environment.OSVersion.Platform == (PlatformID)4) System.Environment.OSVersion.Platform == (PlatformID)4)
{ {
@ -235,73 +230,5 @@ namespace OpenTK
} }
#endregion #endregion
#region Private Methods
// Creates path on disk if it doesn't already exist
static void CreatePath(string path)
{
if (!Directory.Exists(path))
Directory.CreateDirectory(path);
}
// Write OpenTK.dll.config to disk when running on non-Windows platforms.
// Mono will automatically load the config from ~/.mono/assemblies/OpenTK,
// which is great when the user forgets to copy the file on his own
static void WriteConfigFile()
{
Debug.Write("Writing config file ");
string name = null;
string monopath = null;
string asmpath = null;
string outpath = null;
string file_old = null;
string file = null;
try
{
Assembly asm = Assembly.GetAssembly(typeof(Configuration));
name = asm.GetName().Name; // In case someone embeds OpenTK into another dll.
monopath = Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.Personal),
".mono");
asmpath = Path.Combine(monopath, "assemblies");
outpath = Path.Combine(asmpath, name);
file_old = Path.ChangeExtension(name, "dll.config"); // For mono version prior to 1.9
file = Path.ChangeExtension(name, "config"); // For mono 1.9 and higher
Debug.Print("to {0}/{1}.", outpath, file);
CreatePath(monopath);
CreatePath(asmpath);
CreatePath(outpath);
Debug.Print("Loading embedded config.");
// Note: the resource name and namespace are hardcoded.
// This will fail if someone recompiles OpenTK with a different namespace
// (not *our* problem, though).
Stream str = asm.GetManifestResourceStream("OpenTK.OpenTK.dll.config");
if (str != null)
{
using (str)
{
byte[] buffer = new byte[str.Length];
str.Read(buffer, 0, buffer.Length);
string config = System.Text.UnicodeEncoding.Default.GetString(buffer);
System.IO.File.WriteAllText(Path.Combine(outpath, file), config);
System.IO.File.WriteAllText(Path.Combine(outpath, file_old), config);
}
Debug.Print("Success!");
}
else
{
Debug.Print("[Warning] Failed, embedded config not found.");
}
}
catch (Exception e)
{
Debug.Print("[Warning] Failed to write {0} to \"{1}\". Error: {2}", file, outpath, e);
}
}
#endregion
} }
} }