Made framework 4 the default and added fx3 as old.

This commit is contained in:
soukoku
2014-04-20 09:09:25 -04:00
parent 5b1997236a
commit 06d1358fd1
12 changed files with 392 additions and 38 deletions

View File

@@ -1,6 +1,7 @@
using NTwain.Data;
using NTwain.Values;
using System;
using System.IO;
namespace NTwain.Triplets
{
@@ -27,9 +28,8 @@ namespace NTwain.Triplets
return IntPtr.Size == 8;
#else
var path = Path.Combine(Environment.SystemDirectory, "twaindsm.dll");
// if 64bit or the dll exists use it
return IntPtr.Size == 8 ||
File.Exists(path);
// if 64bit or the new dll exists use it
return IntPtr.Size == 8 || File.Exists(path);
#endif
}
internal static readonly bool IsOnMono = Type.GetType("Mono.Runtime") != null;