enable wasi linking

Cargo.toml

@@ -5,6 +5,10 @@ authors = ["Lukas Tobias Wirth <[email protected]>"]
 edition = "2018"
 license = "MIT"
 
+[features]
+wasi = ["ffi/wasi"]
+default = ["wasi"]
+
 [dependencies.ffi]
 path = "wasm3-sys"
 package = "wasm3-sys"

src/module.rs

@@ -115,11 +115,10 @@ impl<'env, 'rt> Module<'env, 'rt> {
         }
     }
 
-    /*requires defines
+    #[cfg(feature = "wasi")]
     pub fn link_wasi(&mut self) {
-        unsafe { ffi::m3_LinkWASI(self.0) };
+        unsafe { ffi::m3_LinkWASI(self.raw) };
     }
-    */
 
     pub fn link_libc(&mut self) {
         unsafe { ffi::m3_LinkLibC(self.raw) };

wasm3-sys/Cargo.toml

@@ -6,6 +6,9 @@ edition = "2018"
 license = "MIT"
 links = "wasm3"
 
+[features]
+wasi = []
+
 [build-dependencies]
 bindgen = "0.52"
 cc = "1"

wasm3-sys/build.rs

@@ -54,11 +54,15 @@ fn main() -> io::Result<()> {
         cfg.flag("/Zo");
         cfg.flag("/arch:AVX2");
     }
-    cfg.warnings(false)
+    let cfg = cfg
+        .warnings(false)
         .cpp(false)
         .define("d_m3LogOutput", Some("0"))
         .extra_warnings(false)
-        .include("wasm3/source")
-        .compile("wasm3");
+        .include("wasm3/source");
+    if cfg!(feature = "wasi") {
+        cfg.define("d_m3HasWASI", None);
+    }
+    cfg.compile("wasm3");
     Ok(())
 }