add wayland feature to linux build, remove x11 from windows build

This commit is contained in:
yuni 2024-04-16 01:22:06 +02:00
parent 0b162de00f
commit 390e7917ad
2 changed files with 5 additions and 3 deletions

View file

@ -11,7 +11,7 @@ rust-version = "1.76.0"
[dependencies] [dependencies]
regex = "1" 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_xpbd_3d = { version = "0.4.2", default-features = false, features = ["3d", "f64", "parry-f64", "parallel", "async-collider"] }
bevy_embedded_assets = "0.10.2" bevy_embedded_assets = "0.10.2"
fastrand = "2.0" fastrand = "2.0"
@ -19,8 +19,10 @@ serde = "1.0"
serde_yaml = "0.9" serde_yaml = "0.9"
[features] [features]
default = ["x11"]
dev = ["bevy/dynamic_linking", "bevy/file_watcher"] dev = ["bevy/dynamic_linking", "bevy/file_watcher"]
wasm = ["bevy/webgl2"] wasm = ["bevy/webgl2"]
x11 = ["bevy/x11"]
wayland = ["bevy/wayland"] wayland = ["bevy/wayland"]
[profile.dev] [profile.dev]

View file

@ -5,8 +5,8 @@
set -e set -e
if [ "$1" == "-b" ]; then if [ "$1" == "-b" ]; then
cargo build --release --target=x86_64-unknown-linux-gnu cargo build --release --target=x86_64-unknown-linux-gnu --features "x11 wayland"
cargo build --release --target=x86_64-pc-windows-gnu cargo build --release --target=x86_64-pc-windows-gnu --no-default-features
fi fi
VERSION="$(sed -nr 's/^\s*version\s*=\s*"(.*)"\s*$/\1/p' Cargo.toml)" VERSION="$(sed -nr 's/^\s*version\s*=\s*"(.*)"\s*$/\1/p' Cargo.toml)"