diff options
author | jeroenwalter <jeroen@enormkansloos.nl> | 2015-12-13 12:48:29 +0100 |
---|---|---|
committer | jeroenwalter <jeroen@enormkansloos.nl> | 2015-12-13 12:48:29 +0100 |
commit | f6452b33fe219fc0edb9a8540603221be23e462d (patch) | |
tree | d348a54ed2d24b8f31c4fdf3023c90f675e466cd /ComicRackWebViewer/BCRInstaller.cs | |
parent | 2287abbca8ef7415845691f35a8517f8b238c0fc (diff) | |
download | ComicRackWeb-master.zip ComicRackWeb-master.tar.gz ComicRackWeb-master.tar.bz2 |
v1.31 for CR 0.9.177HEADorigin/masterorigin/HEADmaster
- updated Sencha Touch to 2.4.2
- updated .NET packages
Diffstat (limited to 'ComicRackWebViewer/BCRInstaller.cs')
-rw-r--r-- | ComicRackWebViewer/BCRInstaller.cs | 65 |
1 files changed, 1 insertions, 64 deletions
diff --git a/ComicRackWebViewer/BCRInstaller.cs b/ComicRackWebViewer/BCRInstaller.cs index 39cc4d0..6d88ad4 100644 --- a/ComicRackWebViewer/BCRInstaller.cs +++ b/ComicRackWebViewer/BCRInstaller.cs @@ -11,68 +11,6 @@ using System.Windows; namespace ComicRackWebViewer { - //public static class NativeMethods - //{ - // [DllImport("kernel32.dll", CallingConvention = CallingConvention.Cdecl)] - // internal static extern bool SetDllDirectory(string pathName); - //} - - - //// http://stackoverflow.com/questions/108971/using-side-by-side-assemblies-to-load-the-x64-or-x32-version-of-a-dll - //public static class MultiplatformDllLoader - //{ - // private static bool _isEnabled; - - // public static void InitNativeDLLPath() - //{ - // // Manually set the DLL load path according to the architecture. - // var path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - - // if (Environment.Is64BitProcess) - // { - // path = Path.Combine(path, "X64"); - // } - // else - // { - // path = Path.Combine(path, "X86"); - // } - - // NativeMethods.SetDllDirectory(path); - //} - - // public static bool Enable - // { - // get { return _isEnabled; } - // set - // { - // lock (typeof(MultiplatformDllLoader)) - // { - // if (_isEnabled != value) - // { - // if (value) - // AppDomain.CurrentDomain.AssemblyResolve += Resolver; - // else - // AppDomain.CurrentDomain.AssemblyResolve -= Resolver; - // _isEnabled = value; - // } - // } - // } - // } - - // /// Will attempt to load missing assembly from either x86 or x64 subdir - // private static Assembly Resolver(object sender, ResolveEventArgs args) - // { - // string assemblyName = args.Name.Split(new[] { ',' }, 2)[0] + ".dll"; - // string archSpecificPath = Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase, - // Environment.Is64BitProcess ? "x64" : "x86", - // assemblyName); - - // return File.Exists(archSpecificPath) - // ? Assembly.LoadFile(archSpecificPath) - // : null; - // } - //} - /// <summary> /// Description of BCRInstaller. /// </summary> @@ -80,7 +18,7 @@ namespace ComicRackWebViewer { private const string INSTALLER_FILE = "BCRPlugin.zip"; private const string VERSION_FILE = "BCRVersion.txt"; - private const string VERSION = "1.30"; + private const string VERSION = "1.31"; public string InstallFolder { get { return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); } } @@ -94,7 +32,6 @@ namespace ComicRackWebViewer private BCRInstaller() { - //MultiplatformDllLoader.InitNativeDLLPath(); } |