From 914d7c88c270866848966c7dacf250fcf9d054c1 Mon Sep 17 00:00:00 2001 From: Andy Killorin <37423245+Speedy6451@users.noreply.github.com> Date: Wed, 13 Sep 2023 15:58:59 -0500 Subject: [PATCH] build for both wasm and native --- justfile | 4 ++-- pirates/Cargo.toml | 2 +- pirates/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/justfile b/justfile index 0fe36d9..79a6b0b 100644 --- a/justfile +++ b/justfile @@ -6,8 +6,8 @@ build: minify-js minify-rust minify-html cp front/style.css build/style.css build-rust: - cargo build --manifest-path pirates/Cargo.toml --target wasm32-unknown-unknown --release - cp pirates/target/wasm32-unknown-unknown/release/pirates.wasm front/index.wasm + cargo build --manifest-path pirates/Cargo.toml --target wasm32-unknown-unknown --features wasm --release + cp target/wasm32-unknown-unknown/release/pirates.wasm front/index.wasm minify-rust: build-rust build-dir wasm-strip front/index.wasm diff --git a/pirates/Cargo.toml b/pirates/Cargo.toml index fe8b79b..1b100e0 100644 --- a/pirates/Cargo.toml +++ b/pirates/Cargo.toml @@ -12,7 +12,7 @@ lto = true opt-level = 's' [lib] -crate-type = ["lib"] +crate-type = ["lib", "cdylib"] [dependencies] keycode = "0.4.0" diff --git a/pirates/src/lib.rs b/pirates/src/lib.rs index 1fc613d..52c3d1f 100644 --- a/pirates/src/lib.rs +++ b/pirates/src/lib.rs @@ -1,4 +1,4 @@ -#[cfg_attr(feature = "wasm", no_std)] +#![cfg_attr(feature = "wasm", no_std)] #[cfg(feature = "wasm")] #[panic_handler]