From 01bf1235aa402fee142bcecb94e983ead7930997 Mon Sep 17 00:00:00 2001 From: dark64 Date: Tue, 24 Jan 2023 14:58:59 +0100 Subject: [PATCH] enable wasm feature only on wasm32 target --- Cargo.toml | 2 +- zokrates_js/Cargo.toml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8c5b2335..585b7e71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] - +resolver = "2" members = [ "zokrates_common", "zokrates_core", diff --git a/zokrates_js/Cargo.toml b/zokrates_js/Cargo.toml index 8f9f3b2c..e0a32bcf 100644 --- a/zokrates_js/Cargo.toml +++ b/zokrates_js/Cargo.toml @@ -3,7 +3,6 @@ name = "zokrates_js" version = "1.1.4" authors = ["Darko Macesic"] edition = "2018" -resolver = "2" [lib] crate-type = ["cdylib"] @@ -18,8 +17,8 @@ lazy_static = "1.4.0" zokrates_field = { path = "../zokrates_field" } zokrates_core = { path = "../zokrates_core", default-features = false, features = ["ark", "bellman"] } zokrates_ark = { path = "../zokrates_ark", default-features = false } -zokrates_embed = { path = "../zokrates_embed", default-features = false, features = ["wasm"] } -zokrates_bellman = { path = "../zokrates_bellman", default-features = false, features = ["wasm"] } +zokrates_embed = { path = "../zokrates_embed", default-features = false } +zokrates_bellman = { path = "../zokrates_bellman", default-features = false } zokrates_common = { path = "../zokrates_common", default-features = false, features = ["ark", "bellman"] } zokrates_proof_systems = { path = "../zokrates_proof_systems", default-features = false } zokrates_ast = { path = "../zokrates_ast", default-features = false, features = ["ark", "bellman"] } @@ -29,6 +28,10 @@ zokrates_circom = { path = "../zokrates_circom" } console_error_panic_hook = "0.1.6" indexmap = "~1.6.2" # see https://github.com/rustwasm/wasm-bindgen/issues/2770#issuecomment-1041102532 +[target.'cfg(target_arch = "wasm32")'.dependencies] +zokrates_embed = { path = "../zokrates_embed", features = ["wasm"] } +zokrates_bellman = { path = "../zokrates_bellman", features = ["wasm"] } + [build-dependencies] json = "0.12.4" walkdir = "2.3.2"