diff --git a/devolutionscrypto/.cargo/config b/devolutionscrypto/.cargo/config new file mode 100644 index 000000000..9b94ca82c --- /dev/null +++ b/devolutionscrypto/.cargo/config @@ -0,0 +1,2 @@ +[target.'cfg(windows)'] +rustflags = ["-Ctarget-feature=+crt-static"] \ No newline at end of file diff --git a/devolutionscrypto/Cargo.toml b/devolutionscrypto/Cargo.toml index bac303ecb..23ea7741f 100644 --- a/devolutionscrypto/Cargo.toml +++ b/devolutionscrypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "devolutionscrypto" -version = "0.1.7" +version = "0.1.8" authors = ["Philippe Dugre ", "Mathieu Morrissette "] edition = "2018" readme = "../README.md" diff --git a/wrappers/csharp/GeneratePackage.py b/wrappers/csharp/GeneratePackage.py index e97e9d483..78a0c8872 100644 --- a/wrappers/csharp/GeneratePackage.py +++ b/wrappers/csharp/GeneratePackage.py @@ -36,7 +36,6 @@ assembly_manifest = assembly_manifest.replace("||VERSION||", version) if sys.argv[1] == "WIN": - # Compile a DevolutionsCrypto.dll in 32 bit and 64 bit for windows platform print("Finding csc compiler...") csc_path = "" diff --git a/wrappers/csharp/Native.cs b/wrappers/csharp/Native.cs index cfae924e3..91c17451b 100644 --- a/wrappers/csharp/Native.cs +++ b/wrappers/csharp/Native.cs @@ -40,7 +40,7 @@ static Native() string path = Path.GetDirectoryName(assembly.Location); - path = Path.Combine(path, IntPtr.Size == 8 ? "x64" : "x86"); + path = Path.Combine(path, Environment.Is64BitProcess ? "x64" : "x86"); bool ok = SetDllDirectory(path);