Successfully compile on Windows

Taaitaaiger · Oct 30, 2021 · 85591f7 · 85591f7
1 parent 0dccc24
commit 85591f7
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 27 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/examples/ccall/callrust.jl b/examples/ccall/callrust.jl
@@ -1,7 +1,17 @@
-x = ccall((:add, "libccall"), Int32, (Int32, Int32), 1, 2)
-println(1, " + ", 2, " = ", x)
+if Sys.iswindows()
+    x = ccall((:add, "ccall"), Int32, (Int32, Int32), 1, 2)
+    println(1, " + ", 2, " = ", x)
 
-y = [1.0 2.0 3.0; 4.0 5.0 6.0; 7.0 8.0 9.0]
-println("Before increment: ", y)
-ccall((:incr_array, "libccall"), Cvoid, (Array{Float64},), y)
-println("After increment: ", y)
+    y = [1.0 2.0 3.0; 4.0 5.0 6.0; 7.0 8.0 9.0]
+    println("Before increment: ", y)
+    ccall((:incr_array, "ccall"), Cvoid, (Array{Float64},), y)
+    println("After increment: ", y)
+else
+    x = ccall((:add, "libccall"), Int32, (Int32, Int32), 1, 2)
+    println(1, " + ", 2, " = ", x)
+
+    y = [1.0 2.0 3.0; 4.0 5.0 6.0; 7.0 8.0 9.0]
+    println("Before increment: ", y)
+    ccall((:incr_array, "libccall"), Cvoid, (Array{Float64},), y)
+    println("After increment: ", y)
+end
diff --git a/examples/ccall_with_threads/callrust.jl b/examples/ccall_with_threads/callrust.jl
@@ -1,9 +1,15 @@
 task = @async begin
     condition = Base.AsyncCondition()
     output::Ref{UInt32} = C_NULL
-    joinhandle = ccall((:multithreaded, "libccall_with_threads"), Ptr{Cvoid}, (Ref{UInt32}, Ptr{Cvoid}), output, condition.handle)
-    wait(condition)
-    ccall((:drop_handle, "libccall_with_threads"), Cvoid, (Ptr{Cvoid},), joinhandle)
+    if Sys.iswindows()
+        joinhandle = ccall((:multithreaded, "ccall_with_threads"), Ptr{Cvoid}, (Ref{UInt32}, Ptr{Cvoid}), output, condition.handle)
+        wait(condition)
+        ccall((:drop_handle, "ccall_with_threads"), Cvoid, (Ptr{Cvoid},), joinhandle)
+    else
+        joinhandle = ccall((:multithreaded, "libccall_with_threads"), Ptr{Cvoid}, (Ref{UInt32}, Ptr{Cvoid}), output, condition.handle)
+        wait(condition)
+        ccall((:drop_handle, "libccall_with_threads"), Cvoid, (Ptr{Cvoid},), joinhandle)
+    end
 
     output[]
 end

diff --git a/jl_sys/build.rs b/jl_sys/build.rs
@@ -17,19 +17,22 @@ fn flags() -> Vec<String> {
     let flags = match find_julia() {
         Some(julia_dir) => {
             let jl_include_path = format!("-I{}/include/julia/", julia_dir);
-            let jl_lib_path = format!("-L{}/lib/", julia_dir);
 
-            println!("cargo:rustc-flags={}", &jl_lib_path);
-
-            #[cfg(target_os = "windows")]
+            #[cfg(target_os = "linux")]
             {
-                let jl_internal_lib_path = format!("-L{}/lib/julia", julia_dir);
-                println!("cargo:rustc-flags={}", &jl_internal_lib_path);
+                let jl_lib_path = format!("-L{}/lib/", julia_dir);
+                println!("cargo:rustc-flags={}", &jl_lib_path);
+
+                if env::var("CARGO_FEATURE_UV").is_ok() {
+                    let jl_internal_lib_path = format!("-L{}/lib/julia", julia_dir);
+                    println!("cargo:rustc-flags={}", &jl_internal_lib_path);
+                }
             }
 
-            if env::var("CARGO_FEATURE_UV").is_ok() {
-                let jl_internal_lib_path = format!("-L{}/lib/julia", julia_dir);
-                println!("cargo:rustc-flags={}", &jl_internal_lib_path);
+            #[cfg(target_os = "windows")]
+            {
+                let jl_lib_path = format!("-L{}/bin/", julia_dir);
+                println!("cargo:rustc-flags={}", &jl_lib_path);
             }
 
             vec![jl_include_path]
@@ -40,15 +43,19 @@ fn flags() -> Vec<String> {
     if env::var("CARGO_FEATURE_DEBUG").is_ok() {
         println!("cargo:rustc-link-lib=julia-debug");
     } else {
-        #[cfg(target_os = "windows")]
-        println!("cargo:rustc-link-lib=static=julia");
-
-        #[cfg(target_os = "linux")]
         println!("cargo:rustc-link-lib=julia");
     }
 
     if env::var("CARGO_FEATURE_UV").is_ok() {
-        println!("cargo:rustc-link-lib=uv");
+        #[cfg(target_os = "windows")]
+        {
+            println!("cargo:rustc-link-lib=uv-2");
+        }
+
+        #[cfg(target_os = "linux")]
+        {
+            println!("cargo:rustc-link-lib=uv");
+        }
     }
 
     flags
@@ -70,13 +77,11 @@ fn main() {
 
     let mut c = cc::Build::new();
     c.file("src/jlrs_c.c");
-    c.static_flag(true);
 
     if flags.len() == 1 {
         c.include(&flags[0][2..]);
     }
 
-
     c.compile("jlrs_c");
 
     #[cfg(feature = "use-bindgen")]

diff --git a/jlrs/Cargo.toml b/jlrs/Cargo.toml
@@ -12,7 +12,10 @@ readme = "../README.md"
 keywords = ["Julia", "math", "mathematics", "bindings", "ffi"]
 categories = ["api-bindings", "mathematics"]
 license = "MIT"
-edition = "2021"
+edition = "2018"
+
+[lib]
+doctest = false
 
 [features]
 default = []
@@ -31,8 +34,8 @@ use-bindgen = ["jl-sys/use-bindgen"]
 
 [dependencies]
 jl-sys = {version = "0.13", path = "../jl_sys" }
-jlrs-derive = { version = "0.3", optional = true, path = "../jlrs_derive" }
 smallvec = "1"
+jlrs-derive = { version = "0.3", optional = true, path = "../jlrs_derive" }
 futures = { version = "0.3", optional = true }
 crossbeam-channel = { version = "0.5", optional = true }
 async-trait = { version = "0.1", optional = true }