From 0024481626650b035521561d3b923a7230ca7b4d Mon Sep 17 00:00:00 2001 From: Elijah Voigt Date: Mon, 30 Dec 2024 23:06:01 -0800 Subject: [PATCH] Make menus more consistent for about/help screens --- .cargo/config.toml | 4 ++++ Makefile | 13 ++++++++----- flake.nix | 1 + src/main.rs | 4 +++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 26e1361..dbdd32a 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -8,6 +8,10 @@ codegen-backend = "cranelift" [profile.quick.package."*"] codegen-backend = "llvm" +[profile.release] +lto = true +opt-level = 'z' + # for Linux [target.x86_64-unknown-linux-gnu] linker = "clang" diff --git a/Makefile b/Makefile index da46f7d..65075dc 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ ### -target/x86_64-unknown-linux-gnu/release/set: src/* +target/x86_64-unknown-linux-gnu/release/set: src/* .cargo/config.toml cargo build --target x86_64-unknown-linux-gnu --features bevy/dynamic_linking --release -target/x86_64-unknown-linux-gnu/quick/set: src/* +target/x86_64-unknown-linux-gnu/quick/set: src/* .cargo/config.toml cargo build --target x86_64-unknown-linux-gnu --features bevy/dynamic_linking --profile quick .PHONY: target/x86_64-unknown-linux-gnu/quick/examples/animation @@ -11,10 +11,10 @@ target/x86_64-unknown-linux-gnu/quick/examples/animation: examples/animation.rs ### ### -target/wasm32-unknown-unknown/debug/set.wasm: src/* +target/wasm32-unknown-unknown/debug/set.wasm: src/* .cargo/config.toml cargo build --target wasm32-unknown-unknown -target/wasm32-unknown-unknown/release/set.wasm: src/* +target/wasm32-unknown-unknown/release/set.wasm: src/* .cargo/config.toml cargo build --target wasm32-unknown-unknown --release ### @@ -24,6 +24,9 @@ out/debug/set.js: target/wasm32-unknown-unknown/debug/set.wasm out/release/set.js: target/wasm32-unknown-unknown/release/set.wasm wasm-bindgen --no-typescript --target web --out-dir "./out/release" ./target/wasm32-unknown-unknown/release/set.wasm + mv out/release/set_bg.wasm out/release/set_bg.original.wasm + wasm-opt -Oz -o out/release/set_bg.wasm out/release/set_bg.original.wasm + rm out/release/set_bg.original.wasm ### ### @@ -77,4 +80,4 @@ web/release/serve: web/release/build ### clean: - rm ./target/*/*/set* + rm ./target/*/*/set* ./out/*/set* diff --git a/flake.nix b/flake.nix index 6ef3091..2ff65f8 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ pkg-config clang lld + binaryen ]; nativeBuildInputs = with pkgs; [ libxkbcommon diff --git a/src/main.rs b/src/main.rs index 94b5f93..134ab62 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,13 +1,15 @@ mod animation; mod audio; mod boot; -mod debug; mod deck; mod menu; mod play; mod setup; mod view; +#[cfg(debug_assertions)] +mod debug; + use bevy::prelude::*; fn main() {