embed assets only in release builds

This commit is contained in:
yuni 2024-04-23 15:39:46 +02:00
parent ce65022905
commit 29f0850874
3 changed files with 10 additions and 13 deletions

View file

@ -24,7 +24,7 @@ build = "build/build.rs"
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", "tonemapping_luts", "vorbis"]} 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", "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 = { version = "0.10.2", optional = true }
fastrand = "2.0" fastrand = "2.0"
serde = "1.0" serde = "1.0"
serde_yaml = "0.9" serde_yaml = "0.9"
@ -38,6 +38,7 @@ dev = ["bevy/dynamic_linking", "bevy/file_watcher"]
wasm = ["bevy/webgl2"] wasm = ["bevy/webgl2"]
x11 = ["bevy/x11"] x11 = ["bevy/x11"]
wayland = ["bevy/wayland"] wayland = ["bevy/wayland"]
embed_assets = ["dep:bevy_embedded_assets"]
[profile.dev] [profile.dev]
opt-level = 1 opt-level = 1

View file

@ -15,8 +15,8 @@
set -e set -e
if [ "$1" == "-b" ]; then if [ "$1" == "-b" ]; then
cargo build --release --target=x86_64-unknown-linux-gnu --features "x11 wayland" cargo build --release --target=x86_64-unknown-linux-gnu --no-default-features --features "x11 wayland embed_assets"
cargo build --release --target=x86_64-pc-windows-gnu --no-default-features cargo build --release --target=x86_64-pc-windows-gnu --no-default-features --features "embed_assets"
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)"

View file

@ -26,7 +26,6 @@ mod nature;
use bevy::window::{Window, WindowMode, PrimaryWindow, CursorGrabMode}; use bevy::window::{Window, WindowMode, PrimaryWindow, CursorGrabMode};
use bevy::diagnostic::FrameTimeDiagnosticsPlugin; use bevy::diagnostic::FrameTimeDiagnosticsPlugin;
use bevy::prelude::*; use bevy::prelude::*;
use bevy_embedded_assets::{EmbeddedAssetPlugin, PluginMode};
use bevy::pbr::ExtendedMaterial; use bevy::pbr::ExtendedMaterial;
use std::env; use std::env;
@ -43,15 +42,12 @@ fn main() {
return; return;
} }
} }
if cfg!(debug_assertions) { let mut app = App::new();
App::new().add_plugins(OutFlyPlugin).run(); #[cfg(feature = "embed_assets")]
} else { app.add_plugins(bevy_embedded_assets::EmbeddedAssetPlugin {
// In release builds, embed assets into the binary mode: bevy_embedded_assets::PluginMode::ReplaceDefault
App::new().add_plugins(( });
EmbeddedAssetPlugin { mode: PluginMode::ReplaceDefault }, app.add_plugins(OutFlyPlugin).run();
OutFlyPlugin,
)).run();
}
} }
pub struct OutFlyPlugin; pub struct OutFlyPlugin;