diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index 3c9f0f5..0000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,5 +0,0 @@ -[build] -target = "x86_64-unknown-linux-gnu" - -[unstable] -build-std = ["std", "panic_abort", "core"] diff --git a/Cargo.toml b/Cargo.toml index 3ffa1a7..d03166a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ threading = ["async-lock", "rayon"] debug = false codegen-units = 1 opt-level = "z" #optimize for size -lto = "fat" +#lto = "fat" #causes issues with wasm, disabling for the time being strip = true panic = "abort" diff --git a/build.sh b/build.sh index 612dc48..b6e2f75 100755 --- a/build.sh +++ b/build.sh @@ -9,17 +9,19 @@ rm -fr pkg | true export RUSTFLAGS="--cfg=web_sys_unstable_apis" if test "$1" == "" || test "$1" == "release"; then - wasm-pack build --target web --no-typescript --release - echo "Binary size (pre-strip): $(du -sb pkg/ytbn_graphing_software_bg.wasm)" - llvm-strip --strip-all pkg/ytbn_graphing_software_bg.wasm - - elif test "$1" == "debug"; then - wasm-pack build --target web --no-typescript --dev + cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --lib + llvm-strip --strip-all target/wasm32-unknown-unknown/release/ytbn_graphing_software.wasm + export TYPE="release" +elif test "$1" == "debug"; then + cargo build --dev --target wasm32-unknown-unknown -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --lib + export TYPE="debug" else echo "ERROR: build.sh, argument invalid" exit 1 fi +wasm-bindgen target/wasm32-unknown-unknown/${TYPE}/ytbn_graphing_software.wasm --out-dir pkg --target web --no-typescript + mkdir tmp cp -r pkg/ytbn_graphing_software_bg.wasm tmp/