diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e33fe9..4abdb15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: override: true - name: Install fonttools - run: sudo apt-get install -y fonttools + run: sudo apt-get install -y fonttools libzstd-dev - name: Install cargo-all-features uses: actions-rs/install@v0.1 diff --git a/Cargo.lock b/Cargo.lock index 8cd8566..d297a78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2128,9 +2128,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47e98e36909e951f4da3908f4475f969bec92a41734dd92e883aaa11c10294b" +checksum = "ed1b83da0a4e48d8dcc13ad177b64f2fc40097974f9bf176c2bcb702cabadff3" dependencies = [ "chrono", "const_format", @@ -2979,4 +2979,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 00d989b..66fab76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ egui = { git = "https://github.com/Titaniumtown/egui.git", default-features = fa epaint = { git = "https://github.com/Titaniumtown/egui.git", default-features = false } emath = { git = "https://github.com/Titaniumtown/egui.git", default-features = false } -shadow-rs = { version = "0.11", default-features = false } +shadow-rs = { version = "0.12", default-features = false } const_format = { version = "0.2", default-features = false, features = ["fmt"] } cfg-if = "1" ruzstd = { git = "https://github.com/KillingSpark/zstd-rs.git" } @@ -56,7 +56,7 @@ serde = "1" benchmarks = { path = "./benchmarks" } [build-dependencies] -shadow-rs = "0.11" +shadow-rs = "0.12" epaint = { git = "https://github.com/Titaniumtown/egui.git", default-features = false } egui = { git = "https://github.com/Titaniumtown/egui.git", default-features = false, features = [ "serde", @@ -64,7 +64,7 @@ egui = { git = "https://github.com/Titaniumtown/egui.git", default-features = fa bincode = "1.3" serde = "1" serde_json = "1" -zstd = "0.11" +zstd = { version = "0.11", default-features = false, features = ["pkg-config"] } run_script = "0.9" json5 = "0.4" itertools = "0.10" diff --git a/build.sh b/build.sh index a3af564..96277d5 100755 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ rm -fr pkg | true export RUSTFLAGS="--cfg=web_sys_unstable_apis" if test "$1" == "" || test "$1" == "release"; then - time cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --lib + time cargo build --release --target wasm32-unknown-unknown -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --lib --timings llvm-strip -s target/wasm32-unknown-unknown/release/ytbn_graphing_software.wasm export TYPE="release" elif test "$1" == "debug"; then