From 390e7917adf4cd48d4ec0e08c20b6c26e22b9c1c Mon Sep 17 00:00:00 2001 From: hut Date: Tue, 16 Apr 2024 01:22:06 +0200 Subject: [PATCH] add wayland feature to linux build, remove x11 from windows build --- Cargo.toml | 4 +++- doc/scripts/pack.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2963b22..8f997bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ rust-version = "1.76.0" [dependencies] regex = "1" -bevy = { version = "0.13.2", default-features = false, features = ["jpeg", "bevy_asset", "bevy_audio", "bevy_scene", "bevy_winit", "bevy_core_pipeline", "bevy_pbr", "bevy_gltf", "bevy_render", "bevy_text", "bevy_ui", "multi-threaded", "png", "tonemapping_luts", "vorbis", "x11"]} +bevy = { version = "0.13.2", default-features = false, features = ["jpeg", "bevy_asset", "bevy_audio", "bevy_scene", "bevy_winit", "bevy_core_pipeline", "bevy_pbr", "bevy_gltf", "bevy_render", "bevy_text", "bevy_ui", "multi-threaded", "png", "tonemapping_luts", "vorbis"]} bevy_xpbd_3d = { version = "0.4.2", default-features = false, features = ["3d", "f64", "parry-f64", "parallel", "async-collider"] } bevy_embedded_assets = "0.10.2" fastrand = "2.0" @@ -19,8 +19,10 @@ serde = "1.0" serde_yaml = "0.9" [features] +default = ["x11"] dev = ["bevy/dynamic_linking", "bevy/file_watcher"] wasm = ["bevy/webgl2"] +x11 = ["bevy/x11"] wayland = ["bevy/wayland"] [profile.dev] diff --git a/doc/scripts/pack.sh b/doc/scripts/pack.sh index 9f59a78..e4049a6 100755 --- a/doc/scripts/pack.sh +++ b/doc/scripts/pack.sh @@ -5,8 +5,8 @@ set -e if [ "$1" == "-b" ]; then - cargo build --release --target=x86_64-unknown-linux-gnu - cargo build --release --target=x86_64-pc-windows-gnu + cargo build --release --target=x86_64-unknown-linux-gnu --features "x11 wayland" + cargo build --release --target=x86_64-pc-windows-gnu --no-default-features fi VERSION="$(sed -nr 's/^\s*version\s*=\s*"(.*)"\s*$/\1/p' Cargo.toml)"