Merge pull request #38 from Devolutions/fix-windows-build-dependencies

Fix windows build dependencies
Devolutions · Oct 29, 2019 · 91f48ba · 91f48ba
2 parents 8ec4c83 + da62acf
commit 91f48ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/devolutionscrypto/.cargo/config b/devolutionscrypto/.cargo/config
@@ -0,0 +1,2 @@
+[target.'cfg(windows)']
+rustflags = ["-Ctarget-feature=+crt-static"]
diff --git 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 <pdugre@devolutions.net>", "Mathieu Morrissette <mmorrissette@devolutions.net>"]
 edition = "2018"
 readme = "../README.md"

diff --git 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
@@ -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);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[target.'cfg(windows)']
		rustflags = ["-Ctarget-feature=+crt-static"]